diff --git a/doc/小米便签代码质量分析报告.docx b/doc/小米便签代码质量分析报告.docx deleted file mode 100644 index daf8922..0000000 Binary files a/doc/小米便签代码质量分析报告.docx and /dev/null differ diff --git a/doc/小米便签开源代码泛读报告.docx b/doc/小米便签开源代码泛读报告.docx deleted file mode 100644 index 236c539..0000000 Binary files a/doc/小米便签开源代码泛读报告.docx and /dev/null differ diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java b/scr/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java deleted file mode 100644 index d97ac5d..0000000 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.data; - -import android.content.Context; -import android.database.Cursor; -import android.provider.ContactsContract.CommonDataKinds.Phone; -import android.provider.ContactsContract.Data; -import android.telephony.PhoneNumberUtils; -import android.util.Log; - -import java.util.HashMap; - -public class Contact { - private static HashMap sContactCache; - private static final String TAG = "Contact"; - - private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER - + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" - + " AND " + Data.RAW_CONTACT_ID + " IN " - + "(SELECT raw_contact_id " - + " FROM phone_lookup" - + " WHERE min_match = '+')"; - - public static String getContact(Context context, String phoneNumber) { - if(sContactCache == null) { - sContactCache = new HashMap(); - } - - if(sContactCache.containsKey(phoneNumber)) { - return sContactCache.get(phoneNumber); - } - - String selection = CALLER_ID_SELECTION.replace("+", - PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); - Cursor cursor = context.getContentResolver().query( - Data.CONTENT_URI, - new String [] { Phone.DISPLAY_NAME }, - selection, - new String[] { phoneNumber }, - null); - - if (cursor != null && cursor.moveToFirst()) { - try { - String name = cursor.getString(0); - sContactCache.put(phoneNumber, name); - return name; - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, " Cursor get string error " + e.toString()); - return null; - } finally { - cursor.close(); - } - } else { - Log.d(TAG, "No contact matched with number:" + phoneNumber); - return null; - } - } -} diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java b/scr/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java deleted file mode 100644 index f240604..0000000 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java +++ /dev/null @@ -1,279 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.data; - -import android.net.Uri; -public class Notes { - public static final String AUTHORITY = "micode_notes"; - public static final String TAG = "Notes"; - public static final int TYPE_NOTE = 0; - public static final int TYPE_FOLDER = 1; - public static final int TYPE_SYSTEM = 2; - - /** - * Following IDs are system folders' identifiers - * {@link Notes#ID_ROOT_FOLDER } is default folder - * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder - * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records - */ - public static final int ID_ROOT_FOLDER = 0; - public static final int ID_TEMPARAY_FOLDER = -1; - public static final int ID_CALL_RECORD_FOLDER = -2; - public static final int ID_TRASH_FOLER = -3; - - public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date"; - public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id"; - public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id"; - public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type"; - public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id"; - public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; - - public static final int TYPE_WIDGET_INVALIDE = -1; - public static final int TYPE_WIDGET_2X = 0; - public static final int TYPE_WIDGET_4X = 1; - - public static class DataConstants { - public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; - public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; - } - - /** - * Uri to query all notes and folders - */ - public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); - - /** - * Uri to query data - */ - public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); - - public interface NoteColumns { - /** - * The unique ID for a row - *

Type: INTEGER (long)

- */ - public static final String ID = "_id"; - - /** - * The parent's id for note or folder - *

Type: INTEGER (long)

- */ - public static final String PARENT_ID = "parent_id"; - - /** - * Created data for note or folder - *

Type: INTEGER (long)

- */ - public static final String CREATED_DATE = "created_date"; - - /** - * Latest modified date - *

Type: INTEGER (long)

- */ - public static final String MODIFIED_DATE = "modified_date"; - - - /** - * Alert date - *

Type: INTEGER (long)

- */ - public static final String ALERTED_DATE = "alert_date"; - - /** - * Folder's name or text content of note - *

Type: TEXT

- */ - public static final String SNIPPET = "snippet"; - - /** - * Note's widget id - *

Type: INTEGER (long)

- */ - public static final String WIDGET_ID = "widget_id"; - - /** - * Note's widget type - *

Type: INTEGER (long)

- */ - public static final String WIDGET_TYPE = "widget_type"; - - /** - * Note's background color's id - *

Type: INTEGER (long)

- */ - public static final String BG_COLOR_ID = "bg_color_id"; - - /** - * For text note, it doesn't has attachment, for multi-media - * note, it has at least one attachment - *

Type: INTEGER

- */ - public static final String HAS_ATTACHMENT = "has_attachment"; - - /** - * Folder's count of notes - *

Type: INTEGER (long)

- */ - public static final String NOTES_COUNT = "notes_count"; - - /** - * The file type: folder or note - *

Type: INTEGER

- */ - public static final String TYPE = "type"; - - /** - * The last sync id - *

Type: INTEGER (long)

- */ - public static final String SYNC_ID = "sync_id"; - - /** - * Sign to indicate local modified or not - *

Type: INTEGER

- */ - public static final String LOCAL_MODIFIED = "local_modified"; - - /** - * Original parent id before moving into temporary folder - *

Type : INTEGER

- */ - public static final String ORIGIN_PARENT_ID = "origin_parent_id"; - - /** - * The gtask id - *

Type : TEXT

- */ - public static final String GTASK_ID = "gtask_id"; - - /** - * The version code - *

Type : INTEGER (long)

- */ - public static final String VERSION = "version"; - } - - public interface DataColumns { - /** - * The unique ID for a row - *

Type: INTEGER (long)

- */ - public static final String ID = "_id"; - - /** - * The MIME type of the item represented by this row. - *

Type: Text

- */ - public static final String MIME_TYPE = "mime_type"; - - /** - * The reference id to note that this data belongs to - *

Type: INTEGER (long)

- */ - public static final String NOTE_ID = "note_id"; - - /** - * Created data for note or folder - *

Type: INTEGER (long)

- */ - public static final String CREATED_DATE = "created_date"; - - /** - * Latest modified date - *

Type: INTEGER (long)

- */ - public static final String MODIFIED_DATE = "modified_date"; - - /** - * Data's content - *

Type: TEXT

- */ - public static final String CONTENT = "content"; - - - /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for - * integer data type - *

Type: INTEGER

- */ - public static final String DATA1 = "data1"; - - /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for - * integer data type - *

Type: INTEGER

- */ - public static final String DATA2 = "data2"; - - /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for - * TEXT data type - *

Type: TEXT

- */ - public static final String DATA3 = "data3"; - - /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for - * TEXT data type - *

Type: TEXT

- */ - public static final String DATA4 = "data4"; - - /** - * Generic data column, the meaning is {@link #MIMETYPE} specific, used for - * TEXT data type - *

Type: TEXT

- */ - public static final String DATA5 = "data5"; - } - - public static final class TextNote implements DataColumns { - /** - * Mode to indicate the text in check list mode or not - *

Type: Integer 1:check list mode 0: normal mode

- */ - public static final String MODE = DATA1; - - public static final int MODE_CHECK_LIST = 1; - - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note"; - - public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; - - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); - } - - public static final class CallNote implements DataColumns { - /** - * Call date for this record - *

Type: INTEGER (long)

- */ - public static final String CALL_DATE = DATA1; - - /** - * Phone number for this record - *

Type: TEXT

- */ - public static final String PHONE_NUMBER = DATA3; - - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note"; - - public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note"; - - public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); - } -} diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java deleted file mode 100644 index 3a2050b..0000000 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.data; - -import android.database.Cursor; -import android.util.Log; - -import net.micode.notes.tool.GTaskStringUtils; - -import org.json.JSONException; -import org.json.JSONObject; - - -public class MetaData extends Task { - private final static String TAG = MetaData.class.getSimpleName(); - - private String mRelatedGid = null; - - public void setMeta(String gid, JSONObject metaInfo) { - try { - metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid); - } catch (JSONException e) { - Log.e(TAG, "failed to put related gid"); - } - setNotes(metaInfo.toString()); - setName(GTaskStringUtils.META_NOTE_NAME); - } - - public String getRelatedGid() { - return mRelatedGid; - } - - @Override - public boolean isWorthSaving() { - return getNotes() != null; - } - - @Override - public void setContentByRemoteJSON(JSONObject js) { - super.setContentByRemoteJSON(js); - if (getNotes() != null) { - try { - JSONObject metaInfo = new JSONObject(getNotes().trim()); - mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID); - } catch (JSONException e) { - Log.w(TAG, "failed to get related gid"); - mRelatedGid = null; - } - } - } - - @Override - public void setContentByLocalJSON(JSONObject js) { - // this function should not be called - throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called"); - } - - @Override - public JSONObject getLocalJSONFromContent() { - throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called"); - } - - @Override - public int getSyncAction(Cursor c) { - throw new IllegalAccessError("MetaData:getSyncAction should not be called"); - } - -} diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java b/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java deleted file mode 100644 index 63950e0..0000000 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.data; - -import android.database.Cursor; - -import org.json.JSONObject; - -public abstract class Node { - public static final int SYNC_ACTION_NONE = 0; - - public static final int SYNC_ACTION_ADD_REMOTE = 1; - - public static final int SYNC_ACTION_ADD_LOCAL = 2; - - public static final int SYNC_ACTION_DEL_REMOTE = 3; - - public static final int SYNC_ACTION_DEL_LOCAL = 4; - - public static final int SYNC_ACTION_UPDATE_REMOTE = 5; - - public static final int SYNC_ACTION_UPDATE_LOCAL = 6; - - public static final int SYNC_ACTION_UPDATE_CONFLICT = 7; - - public static final int SYNC_ACTION_ERROR = 8; - - private String mGid; - - private String mName; - - private long mLastModified; - - private boolean mDeleted; - - public Node() { - mGid = null; - mName = ""; - mLastModified = 0; - mDeleted = false; - } - - public abstract JSONObject getCreateAction(int actionId); - - public abstract JSONObject getUpdateAction(int actionId); - - public abstract void setContentByRemoteJSON(JSONObject js); - - public abstract void setContentByLocalJSON(JSONObject js); - - public abstract JSONObject getLocalJSONFromContent(); - - public abstract int getSyncAction(Cursor c); - - public void setGid(String gid) { - this.mGid = gid; - } - - public void setName(String name) { - this.mName = name; - } - - public void setLastModified(long lastModified) { - this.mLastModified = lastModified; - } - - public void setDeleted(boolean deleted) { - this.mDeleted = deleted; - } - - public String getGid() { - return this.mGid; - } - - public String getName() { - return this.mName; - } - - public long getLastModified() { - return this.mLastModified; - } - - public boolean getDeleted() { - return this.mDeleted; - } - -} diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java deleted file mode 100644 index d3ec3be..0000000 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.data; - -import android.content.ContentResolver; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.net.Uri; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.DataConstants; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.data.NotesDatabaseHelper.TABLE; -import net.micode.notes.gtask.exception.ActionFailureException; - -import org.json.JSONException; -import org.json.JSONObject; - - -public class SqlData { - private static final String TAG = SqlData.class.getSimpleName(); - - private static final int INVALID_ID = -99999; - - public static final String[] PROJECTION_DATA = new String[] { - DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1, - DataColumns.DATA3 - }; - - public static final int DATA_ID_COLUMN = 0; - - public static final int DATA_MIME_TYPE_COLUMN = 1; - - public static final int DATA_CONTENT_COLUMN = 2; - - public static final int DATA_CONTENT_DATA_1_COLUMN = 3; - - public static final int DATA_CONTENT_DATA_3_COLUMN = 4; - - private ContentResolver mContentResolver; - - private boolean mIsCreate; - - private long mDataId; - - private String mDataMimeType; - - private String mDataContent; - - private long mDataContentData1; - - private String mDataContentData3; - - private ContentValues mDiffDataValues; - - public SqlData(Context context) { - mContentResolver = context.getContentResolver(); - mIsCreate = true; - mDataId = INVALID_ID; - mDataMimeType = DataConstants.NOTE; - mDataContent = ""; - mDataContentData1 = 0; - mDataContentData3 = ""; - mDiffDataValues = new ContentValues(); - } - - public SqlData(Context context, Cursor c) { - mContentResolver = context.getContentResolver(); - mIsCreate = false; - loadFromCursor(c); - mDiffDataValues = new ContentValues(); - } - - private void loadFromCursor(Cursor c) { - mDataId = c.getLong(DATA_ID_COLUMN); - mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN); - mDataContent = c.getString(DATA_CONTENT_COLUMN); - mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN); - mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN); - } - - public void setContent(JSONObject js) throws JSONException { - long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID; - if (mIsCreate || mDataId != dataId) { - mDiffDataValues.put(DataColumns.ID, dataId); - } - mDataId = dataId; - - String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE) - : DataConstants.NOTE; - if (mIsCreate || !mDataMimeType.equals(dataMimeType)) { - mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType); - } - mDataMimeType = dataMimeType; - - String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : ""; - if (mIsCreate || !mDataContent.equals(dataContent)) { - mDiffDataValues.put(DataColumns.CONTENT, dataContent); - } - mDataContent = dataContent; - - long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0; - if (mIsCreate || mDataContentData1 != dataContentData1) { - mDiffDataValues.put(DataColumns.DATA1, dataContentData1); - } - mDataContentData1 = dataContentData1; - - String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : ""; - if (mIsCreate || !mDataContentData3.equals(dataContentData3)) { - mDiffDataValues.put(DataColumns.DATA3, dataContentData3); - } - mDataContentData3 = dataContentData3; - } - - public JSONObject getContent() throws JSONException { - if (mIsCreate) { - Log.e(TAG, "it seems that we haven't created this in database yet"); - return null; - } - JSONObject js = new JSONObject(); - js.put(DataColumns.ID, mDataId); - js.put(DataColumns.MIME_TYPE, mDataMimeType); - js.put(DataColumns.CONTENT, mDataContent); - js.put(DataColumns.DATA1, mDataContentData1); - js.put(DataColumns.DATA3, mDataContentData3); - return js; - } - - public void commit(long noteId, boolean validateVersion, long version) { - - if (mIsCreate) { - if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) { - mDiffDataValues.remove(DataColumns.ID); - } - - mDiffDataValues.put(DataColumns.NOTE_ID, noteId); - Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues); - try { - mDataId = Long.valueOf(uri.getPathSegments().get(1)); - } catch (NumberFormatException e) { - Log.e(TAG, "Get note id error :" + e.toString()); - throw new ActionFailureException("create note failed"); - } - } else { - if (mDiffDataValues.size() > 0) { - int result = 0; - if (!validateVersion) { - result = mContentResolver.update(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null); - } else { - result = mContentResolver.update(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, - " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE - + " WHERE " + NoteColumns.VERSION + "=?)", new String[] { - String.valueOf(noteId), String.valueOf(version) - }); - } - if (result == 0) { - Log.w(TAG, "there is no update. maybe user updates note when syncing"); - } - } - } - - mDiffDataValues.clear(); - mIsCreate = false; - } - - public long getId() { - return mDataId; - } -} diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java deleted file mode 100644 index 79a4095..0000000 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java +++ /dev/null @@ -1,505 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.gtask.data; - -import android.appwidget.AppWidgetManager; -import android.content.ContentResolver; -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.net.Uri; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.exception.ActionFailureException; -import net.micode.notes.tool.GTaskStringUtils; -import net.micode.notes.tool.ResourceParser; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; - - -public class SqlNote { - private static final String TAG = SqlNote.class.getSimpleName(); - - private static final int INVALID_ID = -99999; - - public static final String[] PROJECTION_NOTE = new String[] { - NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID, - NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE, - NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE, - NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID, - NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID, - NoteColumns.VERSION - }; - - public static final int ID_COLUMN = 0; - - public static final int ALERTED_DATE_COLUMN = 1; - - public static final int BG_COLOR_ID_COLUMN = 2; - - public static final int CREATED_DATE_COLUMN = 3; - - public static final int HAS_ATTACHMENT_COLUMN = 4; - - public static final int MODIFIED_DATE_COLUMN = 5; - - public static final int NOTES_COUNT_COLUMN = 6; - - public static final int PARENT_ID_COLUMN = 7; - - public static final int SNIPPET_COLUMN = 8; - - public static final int TYPE_COLUMN = 9; - - public static final int WIDGET_ID_COLUMN = 10; - - public static final int WIDGET_TYPE_COLUMN = 11; - - public static final int SYNC_ID_COLUMN = 12; - - public static final int LOCAL_MODIFIED_COLUMN = 13; - - public static final int ORIGIN_PARENT_ID_COLUMN = 14; - - public static final int GTASK_ID_COLUMN = 15; - - public static final int VERSION_COLUMN = 16; - - private Context mContext; - - private ContentResolver mContentResolver; - - private boolean mIsCreate; - - private long mId; - - private long mAlertDate; - - private int mBgColorId; - - private long mCreatedDate; - - private int mHasAttachment; - - private long mModifiedDate; - - private long mParentId; - - private String mSnippet; - - private int mType; - - private int mWidgetId; - - private int mWidgetType; - - private long mOriginParent; - - private long mVersion; - - private ContentValues mDiffNoteValues; - - private ArrayList mDataList; - - public SqlNote(Context context) { - mContext = context; - mContentResolver = context.getContentResolver(); - mIsCreate = true; - mId = INVALID_ID; - mAlertDate = 0; - mBgColorId = ResourceParser.getDefaultBgId(context); - mCreatedDate = System.currentTimeMillis(); - mHasAttachment = 0; - mModifiedDate = System.currentTimeMillis(); - mParentId = 0; - mSnippet = ""; - mType = Notes.TYPE_NOTE; - mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID; - mWidgetType = Notes.TYPE_WIDGET_INVALIDE; - mOriginParent = 0; - mVersion = 0; - mDiffNoteValues = new ContentValues(); - mDataList = new ArrayList(); - } - - public SqlNote(Context context, Cursor c) { - mContext = context; - mContentResolver = context.getContentResolver(); - mIsCreate = false; - loadFromCursor(c); - mDataList = new ArrayList(); - if (mType == Notes.TYPE_NOTE) - loadDataContent(); - mDiffNoteValues = new ContentValues(); - } - - public SqlNote(Context context, long id) { - mContext = context; - mContentResolver = context.getContentResolver(); - mIsCreate = false; - loadFromCursor(id); - mDataList = new ArrayList(); - if (mType == Notes.TYPE_NOTE) - loadDataContent(); - mDiffNoteValues = new ContentValues(); - - } - - private void loadFromCursor(long id) { - Cursor c = null; - try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)", - new String[] { - String.valueOf(id) - }, null); - if (c != null) { - c.moveToNext(); - loadFromCursor(c); - } else { - Log.w(TAG, "loadFromCursor: cursor = null"); - } - } finally { - if (c != null) - c.close(); - } - } - - private void loadFromCursor(Cursor c) { - mId = c.getLong(ID_COLUMN); - mAlertDate = c.getLong(ALERTED_DATE_COLUMN); - mBgColorId = c.getInt(BG_COLOR_ID_COLUMN); - mCreatedDate = c.getLong(CREATED_DATE_COLUMN); - mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN); - mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN); - mParentId = c.getLong(PARENT_ID_COLUMN); - mSnippet = c.getString(SNIPPET_COLUMN); - mType = c.getInt(TYPE_COLUMN); - mWidgetId = c.getInt(WIDGET_ID_COLUMN); - mWidgetType = c.getInt(WIDGET_TYPE_COLUMN); - mVersion = c.getLong(VERSION_COLUMN); - } - - private void loadDataContent() { - Cursor c = null; - mDataList.clear(); - try { - c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA, - "(note_id=?)", new String[] { - String.valueOf(mId) - }, null); - if (c != null) { - if (c.getCount() == 0) { - Log.w(TAG, "it seems that the note has not data"); - return; - } - while (c.moveToNext()) { - SqlData data = new SqlData(mContext, c); - mDataList.add(data); - } - } else { - Log.w(TAG, "loadDataContent: cursor = null"); - } - } finally { - if (c != null) - c.close(); - } - } - - public boolean setContent(JSONObject js) { - try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { - Log.w(TAG, "cannot set system folder"); - } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { - // for folder we can only update the snnipet and type - String snippet = note.has(NoteColumns.SNIPPET) ? note - .getString(NoteColumns.SNIPPET) : ""; - if (mIsCreate || !mSnippet.equals(snippet)) { - mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); - } - mSnippet = snippet; - - int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) - : Notes.TYPE_NOTE; - if (mIsCreate || mType != type) { - mDiffNoteValues.put(NoteColumns.TYPE, type); - } - mType = type; - } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) { - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID; - if (mIsCreate || mId != id) { - mDiffNoteValues.put(NoteColumns.ID, id); - } - mId = id; - - long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note - .getLong(NoteColumns.ALERTED_DATE) : 0; - if (mIsCreate || mAlertDate != alertDate) { - mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate); - } - mAlertDate = alertDate; - - int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note - .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext); - if (mIsCreate || mBgColorId != bgColorId) { - mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId); - } - mBgColorId = bgColorId; - - long createDate = note.has(NoteColumns.CREATED_DATE) ? note - .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis(); - if (mIsCreate || mCreatedDate != createDate) { - mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate); - } - mCreatedDate = createDate; - - int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note - .getInt(NoteColumns.HAS_ATTACHMENT) : 0; - if (mIsCreate || mHasAttachment != hasAttachment) { - mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment); - } - mHasAttachment = hasAttachment; - - long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note - .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis(); - if (mIsCreate || mModifiedDate != modifiedDate) { - mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate); - } - mModifiedDate = modifiedDate; - - long parentId = note.has(NoteColumns.PARENT_ID) ? note - .getLong(NoteColumns.PARENT_ID) : 0; - if (mIsCreate || mParentId != parentId) { - mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId); - } - mParentId = parentId; - - String snippet = note.has(NoteColumns.SNIPPET) ? note - .getString(NoteColumns.SNIPPET) : ""; - if (mIsCreate || !mSnippet.equals(snippet)) { - mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); - } - mSnippet = snippet; - - int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) - : Notes.TYPE_NOTE; - if (mIsCreate || mType != type) { - mDiffNoteValues.put(NoteColumns.TYPE, type); - } - mType = type; - - int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID) - : AppWidgetManager.INVALID_APPWIDGET_ID; - if (mIsCreate || mWidgetId != widgetId) { - mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId); - } - mWidgetId = widgetId; - - int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note - .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE; - if (mIsCreate || mWidgetType != widgetType) { - mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType); - } - mWidgetType = widgetType; - - long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note - .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0; - if (mIsCreate || mOriginParent != originParent) { - mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent); - } - mOriginParent = originParent; - - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - SqlData sqlData = null; - if (data.has(DataColumns.ID)) { - long dataId = data.getLong(DataColumns.ID); - for (SqlData temp : mDataList) { - if (dataId == temp.getId()) { - sqlData = temp; - } - } - } - - if (sqlData == null) { - sqlData = new SqlData(mContext); - mDataList.add(sqlData); - } - - sqlData.setContent(data); - } - } - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return false; - } - return true; - } - - public JSONObject getContent() { - try { - JSONObject js = new JSONObject(); - - if (mIsCreate) { - Log.e(TAG, "it seems that we haven't created this in database yet"); - return null; - } - - JSONObject note = new JSONObject(); - if (mType == Notes.TYPE_NOTE) { - note.put(NoteColumns.ID, mId); - note.put(NoteColumns.ALERTED_DATE, mAlertDate); - note.put(NoteColumns.BG_COLOR_ID, mBgColorId); - note.put(NoteColumns.CREATED_DATE, mCreatedDate); - note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment); - note.put(NoteColumns.MODIFIED_DATE, mModifiedDate); - note.put(NoteColumns.PARENT_ID, mParentId); - note.put(NoteColumns.SNIPPET, mSnippet); - note.put(NoteColumns.TYPE, mType); - note.put(NoteColumns.WIDGET_ID, mWidgetId); - note.put(NoteColumns.WIDGET_TYPE, mWidgetType); - note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); - - JSONArray dataArray = new JSONArray(); - for (SqlData sqlData : mDataList) { - JSONObject data = sqlData.getContent(); - if (data != null) { - dataArray.put(data); - } - } - js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); - } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) { - note.put(NoteColumns.ID, mId); - note.put(NoteColumns.TYPE, mType); - note.put(NoteColumns.SNIPPET, mSnippet); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); - } - - return js; - } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - } - return null; - } - - public void setParentId(long id) { - mParentId = id; - mDiffNoteValues.put(NoteColumns.PARENT_ID, id); - } - - public void setGtaskId(String gid) { - mDiffNoteValues.put(NoteColumns.GTASK_ID, gid); - } - - public void setSyncId(long syncId) { - mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId); - } - - public void resetLocalModified() { - mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0); - } - - public long getId() { - return mId; - } - - public long getParentId() { - return mParentId; - } - - public String getSnippet() { - return mSnippet; - } - - public boolean isNoteType() { - return mType == Notes.TYPE_NOTE; - } - - public void commit(boolean validateVersion) { - if (mIsCreate) { - if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) { - mDiffNoteValues.remove(NoteColumns.ID); - } - - Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues); - try { - mId = Long.valueOf(uri.getPathSegments().get(1)); - } catch (NumberFormatException e) { - Log.e(TAG, "Get note id error :" + e.toString()); - throw new ActionFailureException("create note failed"); - } - if (mId == 0) { - throw new IllegalStateException("Create thread id failed"); - } - - if (mType == Notes.TYPE_NOTE) { - for (SqlData sqlData : mDataList) { - sqlData.commit(mId, false, -1); - } - } - } else { - if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) { - Log.e(TAG, "No such note"); - throw new IllegalStateException("Try to update note with invalid id"); - } - if (mDiffNoteValues.size() > 0) { - mVersion ++; - int result = 0; - if (!validateVersion) { - result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" - + NoteColumns.ID + "=?)", new String[] { - String.valueOf(mId) - }); - } else { - result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" - + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)", - new String[] { - String.valueOf(mId), String.valueOf(mVersion) - }); - } - if (result == 0) { - Log.w(TAG, "there is no update. maybe user updates note when syncing"); - } - } - - if (mType == Notes.TYPE_NOTE) { - for (SqlData sqlData : mDataList) { - sqlData.commit(mId, validateVersion, mVersion); - } - } - } - - // refresh local info - loadFromCursor(mId); - if (mType == Notes.TYPE_NOTE) - loadDataContent(); - - mDiffNoteValues.clear(); - mIsCreate = false; - } -} diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java b/scr/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java deleted file mode 100644 index 6706cf6..0000000 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java +++ /dev/null @@ -1,253 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.model; -import android.content.ContentProviderOperation; -import android.content.ContentProviderResult; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Context; -import android.content.OperationApplicationException; -import android.net.Uri; -import android.os.RemoteException; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.CallNote; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.data.Notes.TextNote; - -import java.util.ArrayList; - - -public class Note { - private ContentValues mNoteDiffValues; - private NoteData mNoteData; - private static final String TAG = "Note"; - /** - * Create a new note id for adding a new note to databases - */ - public static synchronized long getNewNoteId(Context context, long folderId) { - // Create a new note in the database - ContentValues values = new ContentValues(); - long createdTime = System.currentTimeMillis(); - values.put(NoteColumns.CREATED_DATE, createdTime); - values.put(NoteColumns.MODIFIED_DATE, createdTime); - values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); - values.put(NoteColumns.LOCAL_MODIFIED, 1); - values.put(NoteColumns.PARENT_ID, folderId); - Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); - - long noteId = 0; - try { - noteId = Long.valueOf(uri.getPathSegments().get(1)); - } catch (NumberFormatException e) { - Log.e(TAG, "Get note id error :" + e.toString()); - noteId = 0; - } - if (noteId == -1) { - throw new IllegalStateException("Wrong note id:" + noteId); - } - return noteId; - } - - public Note() { - mNoteDiffValues = new ContentValues(); - mNoteData = new NoteData(); - } - - public void setNoteValue(String key, String value) { - mNoteDiffValues.put(key, value); - mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); - mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } - - public void setTextData(String key, String value) { - mNoteData.setTextData(key, value); - } - - public void setTextDataId(long id) { - mNoteData.setTextDataId(id); - } - - public long getTextDataId() { - return mNoteData.mTextDataId; - } - - public void setCallDataId(long id) { - mNoteData.setCallDataId(id); - } - - public void setCallData(String key, String value) { - mNoteData.setCallData(key, value); - } - - public boolean isLocalModified() { - return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified(); - } - - public boolean syncNote(Context context, long noteId) { - if (noteId <= 0) { - throw new IllegalArgumentException("Wrong note id:" + noteId); - } - - if (!isLocalModified()) { - return true; - } - - /** - * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and - * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the - * note data info - */ - if (context.getContentResolver().update( - ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null, - null) == 0) { - Log.e(TAG, "Update note error, should not happen"); - // Do not return, fall through - } - mNoteDiffValues.clear(); - - if (mNoteData.isLocalModified() - && (mNoteData.pushIntoContentResolver(context, noteId) == null)) { - return false; - } - - return true; - } - - private class NoteData { - private long mTextDataId; - - private ContentValues mTextDataValues; - - private long mCallDataId; - - private ContentValues mCallDataValues; - - private static final String TAG = "NoteData"; - - public NoteData() { - mTextDataValues = new ContentValues(); - mCallDataValues = new ContentValues(); - mTextDataId = 0; - mCallDataId = 0; - } - - boolean isLocalModified() { - return mTextDataValues.size() > 0 || mCallDataValues.size() > 0; - } - - void setTextDataId(long id) { - if(id <= 0) { - throw new IllegalArgumentException("Text data id should larger than 0"); - } - mTextDataId = id; - } - - void setCallDataId(long id) { - if (id <= 0) { - throw new IllegalArgumentException("Call data id should larger than 0"); - } - mCallDataId = id; - } - - void setCallData(String key, String value) { - mCallDataValues.put(key, value); - mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); - mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } - - void setTextData(String key, String value) { - mTextDataValues.put(key, value); - mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); - mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } - - Uri pushIntoContentResolver(Context context, long noteId) { - /** - * Check for safety - */ - if (noteId <= 0) { - throw new IllegalArgumentException("Wrong note id:" + noteId); - } - - ArrayList operationList = new ArrayList(); - ContentProviderOperation.Builder builder = null; - - if(mTextDataValues.size() > 0) { - mTextDataValues.put(DataColumns.NOTE_ID, noteId); - if (mTextDataId == 0) { - mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE); - Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, - mTextDataValues); - try { - setTextDataId(Long.valueOf(uri.getPathSegments().get(1))); - } catch (NumberFormatException e) { - Log.e(TAG, "Insert new text data fail with noteId" + noteId); - mTextDataValues.clear(); - return null; - } - } else { - builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mTextDataId)); - builder.withValues(mTextDataValues); - operationList.add(builder.build()); - } - mTextDataValues.clear(); - } - - if(mCallDataValues.size() > 0) { - mCallDataValues.put(DataColumns.NOTE_ID, noteId); - if (mCallDataId == 0) { - mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE); - Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, - mCallDataValues); - try { - setCallDataId(Long.valueOf(uri.getPathSegments().get(1))); - } catch (NumberFormatException e) { - Log.e(TAG, "Insert new call data fail with noteId" + noteId); - mCallDataValues.clear(); - return null; - } - } else { - builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mCallDataId)); - builder.withValues(mCallDataValues); - operationList.add(builder.build()); - } - mCallDataValues.clear(); - } - - if (operationList.size() > 0) { - try { - ContentProviderResult[] results = context.getContentResolver().applyBatch( - Notes.AUTHORITY, operationList); - return (results == null || results.length == 0 || results[0] == null) ? null - : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId); - } catch (RemoteException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - return null; - } catch (OperationApplicationException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); - return null; - } - } - return null; - } - } -} diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java b/scr/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java deleted file mode 100644 index be081e4..0000000 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ /dev/null @@ -1,368 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.model; - -import android.appwidget.AppWidgetManager; -import android.content.ContentUris; -import android.content.Context; -import android.database.Cursor; -import android.text.TextUtils; -import android.util.Log; - -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.CallNote; -import net.micode.notes.data.Notes.DataColumns; -import net.micode.notes.data.Notes.DataConstants; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.data.Notes.TextNote; -import net.micode.notes.tool.ResourceParser.NoteBgResources; - - -public class WorkingNote { - // Note for the working note - private Note mNote; - // Note Id - private long mNoteId; - // Note content - private String mContent; - // Note mode - private int mMode; - - private long mAlertDate; - - private long mModifiedDate; - - private int mBgColorId; - - private int mWidgetId; - - private int mWidgetType; - - private long mFolderId; - - private Context mContext; - - private static final String TAG = "WorkingNote"; - - private boolean mIsDeleted; - - private NoteSettingChangedListener mNoteSettingStatusListener; - - public static final String[] DATA_PROJECTION = new String[] { - DataColumns.ID, - DataColumns.CONTENT, - DataColumns.MIME_TYPE, - DataColumns.DATA1, - DataColumns.DATA2, - DataColumns.DATA3, - DataColumns.DATA4, - }; - - public static final String[] NOTE_PROJECTION = new String[] { - NoteColumns.PARENT_ID, - NoteColumns.ALERTED_DATE, - NoteColumns.BG_COLOR_ID, - NoteColumns.WIDGET_ID, - NoteColumns.WIDGET_TYPE, - NoteColumns.MODIFIED_DATE - }; - - private static final int DATA_ID_COLUMN = 0; - - private static final int DATA_CONTENT_COLUMN = 1; - - private static final int DATA_MIME_TYPE_COLUMN = 2; - - private static final int DATA_MODE_COLUMN = 3; - - private static final int NOTE_PARENT_ID_COLUMN = 0; - - private static final int NOTE_ALERTED_DATE_COLUMN = 1; - - private static final int NOTE_BG_COLOR_ID_COLUMN = 2; - - private static final int NOTE_WIDGET_ID_COLUMN = 3; - - private static final int NOTE_WIDGET_TYPE_COLUMN = 4; - - private static final int NOTE_MODIFIED_DATE_COLUMN = 5; - - // New note construct - private WorkingNote(Context context, long folderId) { - mContext = context; - mAlertDate = 0; - mModifiedDate = System.currentTimeMillis(); - mFolderId = folderId; - mNote = new Note(); - mNoteId = 0; - mIsDeleted = false; - mMode = 0; - mWidgetType = Notes.TYPE_WIDGET_INVALIDE; - } - - // Existing note construct - private WorkingNote(Context context, long noteId, long folderId) { - mContext = context; - mNoteId = noteId; - mFolderId = folderId; - mIsDeleted = false; - mNote = new Note(); - loadNote(); - } - - private void loadNote() { - Cursor cursor = mContext.getContentResolver().query( - ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null, - null, null); - - if (cursor != null) { - if (cursor.moveToFirst()) { - mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN); - mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN); - mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN); - mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN); - mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN); - mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN); - } - cursor.close(); - } else { - Log.e(TAG, "No note with id:" + mNoteId); - throw new IllegalArgumentException("Unable to find note with id " + mNoteId); - } - loadNoteData(); - } - - private void loadNoteData() { - Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION, - DataColumns.NOTE_ID + "=?", new String[] { - String.valueOf(mNoteId) - }, null); - - if (cursor != null) { - if (cursor.moveToFirst()) { - do { - String type = cursor.getString(DATA_MIME_TYPE_COLUMN); - if (DataConstants.NOTE.equals(type)) { - mContent = cursor.getString(DATA_CONTENT_COLUMN); - mMode = cursor.getInt(DATA_MODE_COLUMN); - mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN)); - } else if (DataConstants.CALL_NOTE.equals(type)) { - mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN)); - } else { - Log.d(TAG, "Wrong note type with type:" + type); - } - } while (cursor.moveToNext()); - } - cursor.close(); - } else { - Log.e(TAG, "No data with id:" + mNoteId); - throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId); - } - } - - public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId, - int widgetType, int defaultBgColorId) { - WorkingNote note = new WorkingNote(context, folderId); - note.setBgColorId(defaultBgColorId); - note.setWidgetId(widgetId); - note.setWidgetType(widgetType); - return note; - } - - public static WorkingNote load(Context context, long id) { - return new WorkingNote(context, id, 0); - } - - public synchronized boolean saveNote() { - if (isWorthSaving()) { - if (!existInDatabase()) { - if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) { - Log.e(TAG, "Create new note fail with id:" + mNoteId); - return false; - } - } - - mNote.syncNote(mContext, mNoteId); - - /** - * Update widget content if there exist any widget of this note - */ - if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID - && mWidgetType != Notes.TYPE_WIDGET_INVALIDE - && mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onWidgetChanged(); - } - return true; - } else { - return false; - } - } - - public boolean existInDatabase() { - return mNoteId > 0; - } - - private boolean isWorthSaving() { - if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent)) - || (existInDatabase() && !mNote.isLocalModified())) { - return false; - } else { - return true; - } - } - - public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) { - mNoteSettingStatusListener = l; - } - - public void setAlertDate(long date, boolean set) { - if (date != mAlertDate) { - mAlertDate = date; - mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate)); - } - if (mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onClockAlertChanged(date, set); - } - } - - public void markDeleted(boolean mark) { - mIsDeleted = mark; - if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID - && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onWidgetChanged(); - } - } - - public void setBgColorId(int id) { - if (id != mBgColorId) { - mBgColorId = id; - if (mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onBackgroundColorChanged(); - } - mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id)); - } - } - - public void setCheckListMode(int mode) { - if (mMode != mode) { - if (mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode); - } - mMode = mode; - mNote.setTextData(TextNote.MODE, String.valueOf(mMode)); - } - } - - public void setWidgetType(int type) { - if (type != mWidgetType) { - mWidgetType = type; - mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType)); - } - } - - public void setWidgetId(int id) { - if (id != mWidgetId) { - mWidgetId = id; - mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId)); - } - } - - public void setWorkingText(String text) { - if (!TextUtils.equals(mContent, text)) { - mContent = text; - mNote.setTextData(DataColumns.CONTENT, mContent); - } - } - - public void convertToCallNote(String phoneNumber, long callDate) { - mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate)); - mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber); - mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER)); - } - - public boolean hasClockAlert() { - return (mAlertDate > 0 ? true : false); - } - - public String getContent() { - return mContent; - } - - public long getAlertDate() { - return mAlertDate; - } - - public long getModifiedDate() { - return mModifiedDate; - } - - public int getBgColorResId() { - return NoteBgResources.getNoteBgResource(mBgColorId); - } - - public int getBgColorId() { - return mBgColorId; - } - - public int getTitleBgResId() { - return NoteBgResources.getNoteTitleBgResource(mBgColorId); - } - - public int getCheckListMode() { - return mMode; - } - - public long getNoteId() { - return mNoteId; - } - - public long getFolderId() { - return mFolderId; - } - - public int getWidgetId() { - return mWidgetId; - } - - public int getWidgetType() { - return mWidgetType; - } - - public interface NoteSettingChangedListener { - /** - * Called when the background color of current note has just changed - */ - void onBackgroundColorChanged(); - - /** - * Called when user set clock - */ - void onClockAlertChanged(long date, boolean set); - - /** - * Call when user create note from widget - */ - void onWidgetChanged(); - - /** - * Call when switch between check list mode and normal mode - * @param oldMode is previous mode before change - * @param newMode is new mode - */ - void onCheckListModeChanged(int oldMode, int newMode); - } -} diff --git a/scr/Notes-master1/.gradle/8.0/checksums/checksums.lock b/src/Notes-master1/.gradle/8.0/checksums/checksums.lock similarity index 100% rename from scr/Notes-master1/.gradle/8.0/checksums/checksums.lock rename to src/Notes-master1/.gradle/8.0/checksums/checksums.lock diff --git a/scr/Notes-master1/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock b/src/Notes-master1/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock similarity index 100% rename from scr/Notes-master1/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock rename to src/Notes-master1/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock diff --git a/scr/Notes-master1/.gradle/8.0/dependencies-accessors/gc.properties b/src/Notes-master1/.gradle/8.0/dependencies-accessors/gc.properties similarity index 100% rename from scr/Notes-master1/.gradle/8.0/dependencies-accessors/gc.properties rename to src/Notes-master1/.gradle/8.0/dependencies-accessors/gc.properties diff --git a/scr/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin similarity index 100% rename from scr/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin rename to src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin diff --git a/scr/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock similarity index 100% rename from scr/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock rename to src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock diff --git a/scr/Notes-master1/.gradle/8.0/fileChanges/last-build.bin b/src/Notes-master1/.gradle/8.0/fileChanges/last-build.bin similarity index 100% rename from scr/Notes-master1/.gradle/8.0/fileChanges/last-build.bin rename to src/Notes-master1/.gradle/8.0/fileChanges/last-build.bin diff --git a/scr/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin similarity index 100% rename from scr/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin rename to src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin diff --git a/scr/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock similarity index 100% rename from scr/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock rename to src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock diff --git a/scr/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin similarity index 100% rename from scr/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin rename to src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin diff --git a/scr/Notes-master1/.gradle/8.0/gc.properties b/src/Notes-master1/.gradle/8.0/gc.properties similarity index 100% rename from scr/Notes-master1/.gradle/8.0/gc.properties rename to src/Notes-master1/.gradle/8.0/gc.properties diff --git a/scr/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock similarity index 100% rename from scr/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock rename to src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock diff --git a/scr/Notes-master1/.gradle/buildOutputCleanup/cache.properties b/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties similarity index 100% rename from scr/Notes-master1/.gradle/buildOutputCleanup/cache.properties rename to src/Notes-master1/.gradle/buildOutputCleanup/cache.properties diff --git a/scr/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin similarity index 100% rename from scr/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin rename to src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin diff --git a/scr/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe similarity index 100% rename from scr/Notes-master1/.gradle/file-system.probe rename to src/Notes-master1/.gradle/file-system.probe diff --git a/scr/Notes-master1/.gradle/vcs-1/gc.properties b/src/Notes-master1/.gradle/vcs-1/gc.properties similarity index 100% rename from scr/Notes-master1/.gradle/vcs-1/gc.properties rename to src/Notes-master1/.gradle/vcs-1/gc.properties diff --git a/scr/Notes-master1/.idea/.gitignore b/src/Notes-master1/.idea/.gitignore similarity index 100% rename from scr/Notes-master1/.idea/.gitignore rename to src/Notes-master1/.idea/.gitignore diff --git a/scr/Notes-master1/.idea/compiler.xml b/src/Notes-master1/.idea/compiler.xml similarity index 100% rename from scr/Notes-master1/.idea/compiler.xml rename to src/Notes-master1/.idea/compiler.xml diff --git a/scr/Notes-master1/.idea/gradle.xml b/src/Notes-master1/.idea/gradle.xml similarity index 100% rename from scr/Notes-master1/.idea/gradle.xml rename to src/Notes-master1/.idea/gradle.xml diff --git a/scr/Notes-master1/.idea/jarRepositories.xml b/src/Notes-master1/.idea/jarRepositories.xml similarity index 100% rename from scr/Notes-master1/.idea/jarRepositories.xml rename to src/Notes-master1/.idea/jarRepositories.xml diff --git a/scr/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml similarity index 100% rename from scr/Notes-master1/.idea/misc.xml rename to src/Notes-master1/.idea/misc.xml diff --git a/scr/Notes-master1/.idea/vcs.xml b/src/Notes-master1/.idea/vcs.xml similarity index 100% rename from scr/Notes-master1/.idea/vcs.xml rename to src/Notes-master1/.idea/vcs.xml diff --git a/scr/Notes-master1/app/build.gradle b/src/Notes-master1/app/build.gradle similarity index 100% rename from scr/Notes-master1/app/build.gradle rename to src/Notes-master1/app/build.gradle diff --git a/scr/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json rename to src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json diff --git a/scr/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk similarity index 100% rename from scr/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk rename to src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk diff --git a/scr/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json rename to src/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json diff --git a/scr/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt similarity index 100% rename from scr/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt rename to src/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt diff --git a/scr/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties b/src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties similarity index 100% rename from scr/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties rename to src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties diff --git a/scr/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json rename to src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json diff --git a/scr/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar similarity index 100% rename from scr/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar rename to src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_0/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_0/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_0/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_1/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_1/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_1/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_2/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_2/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_2/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_3/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_3/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_3/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_4/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_4/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_4/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_5/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_5/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_5/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_6/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_6/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_6/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_6/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_7/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_7/graph.bin similarity index 100% rename from scr/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_7/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_d199792c6ee532722f096405eeeb41a04279774f91deb4502321ddf927305d36_bucket_7/graph.bin diff --git a/scr/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex rename to src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex diff --git a/scr/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out similarity index 100% rename from scr/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out rename to src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out diff --git a/scr/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out similarity index 100% rename from scr/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out rename to src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out diff --git a/scr/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state diff --git a/scr/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties rename to src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties diff --git a/scr/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml rename to src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml diff --git a/scr/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml rename to src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml diff --git a/scr/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml rename to src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml diff --git a/scr/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml rename to src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml diff --git a/scr/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties rename to src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties diff --git a/scr/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml rename to src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml diff --git a/scr/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml rename to src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml diff --git a/scr/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml rename to src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml diff --git a/scr/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml rename to src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml diff --git a/scr/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml rename to src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml diff --git a/scr/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml rename to src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml diff --git a/scr/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml rename to src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml diff --git a/scr/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt rename to src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt diff --git a/scr/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources rename to src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources diff --git a/scr/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 similarity index 100% rename from scr/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 rename to src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class diff --git a/scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class similarity index 100% rename from scr/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class diff --git a/scr/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt similarity index 100% rename from scr/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt rename to src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt diff --git a/scr/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt similarity index 100% rename from scr/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt rename to src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt diff --git a/scr/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar b/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar rename to src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar diff --git a/scr/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml rename to src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml diff --git a/scr/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml rename to src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml diff --git a/scr/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json rename to src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat rename to src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat diff --git a/scr/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json rename to src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json diff --git a/scr/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json rename to src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json diff --git a/scr/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json rename to src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json diff --git a/scr/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json rename to src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json diff --git a/scr/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json rename to src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json diff --git a/scr/Notes-master1/app/build/intermediates/navigation_json/debug/navigation.json b/src/Notes-master1/app/build/intermediates/navigation_json/debug/navigation.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/navigation_json/debug/navigation.json rename to src/Notes-master1/app/build/intermediates/navigation_json/debug/navigation.json diff --git a/scr/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml rename to src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json rename to src/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_btn_set_color.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_btn_set_color.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_btn_set_color.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_btn_set_color.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_color_btn_mask.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_color_btn_mask.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_color_btn_mask.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_color_btn_mask.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/call_record.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/call_record.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/call_record.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/call_record.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/clock.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/clock.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/clock.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/clock.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/delete.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/delete.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/delete.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/delete.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/dropdown_icon.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/dropdown_icon.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/dropdown_icon.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/dropdown_icon.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_blue.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_blue.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_blue.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_blue.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_green.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_green.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_green.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_green.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_red.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_red.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_red.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_red.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_blue.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_blue.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_blue.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_blue.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_green.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_green.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_green.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_green.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_red.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_red.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_red.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_red.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_white.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_white.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_white.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_white.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_yellow.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_yellow.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_yellow.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_yellow.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_white.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_white.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_white.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_white.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_yellow.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_yellow.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_yellow.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_yellow.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_large.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_large.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_large.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_large.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_normal.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_normal.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_normal.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_normal.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_size_selector_bg.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_size_selector_bg.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_size_selector_bg.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_size_selector_bg.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_small.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_small.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_small.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_small.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_super.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_super.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_super.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_super.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/icon_app.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/icon_app.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/icon_app.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/icon_app.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_background.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_background.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_background.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_background.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_down.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_down.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_down.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_down.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_middle.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_middle.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_middle.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_middle.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_single.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_single.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_single.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_single.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_up.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_up.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_up.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_up.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_folder.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_folder.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_folder.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_folder.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_footer_bg.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_footer_bg.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_footer_bg.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_footer_bg.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_down.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_down.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_down.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_down.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_middle.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_middle.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_middle.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_middle.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_single.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_single.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_single.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_single.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_up.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_up.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_up.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_up.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_down.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_down.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_down.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_down.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_middle.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_middle.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_middle.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_middle.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_single.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_single.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_single.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_single.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_up.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_up.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_up.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_up.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_down.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_down.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_down.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_down.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_middle.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_middle.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_middle.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_middle.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_single.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_single.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_single.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_single.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_up.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_up.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_up.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_up.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_down.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_down.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_down.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_down.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_middle.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_middle.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_middle.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_middle.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_single.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_single.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_single.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_single.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_up.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_up.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_up.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_up.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_delete.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_delete.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_delete.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_delete.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_move.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_move.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_move.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_move.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_normal.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_normal.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_normal.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_normal.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_pressed.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_pressed.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_pressed.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_pressed.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/note_edit_color_selector_panel.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/note_edit_color_selector_panel.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/note_edit_color_selector_panel.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/note_edit_color_selector_panel.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/notification.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/notification.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/notification.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/notification.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/search_result.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/search_result.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/search_result.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/search_result.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/selected.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/selected.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/selected.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/selected.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_alert.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_alert.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_alert.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_alert.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_bar_bg.9.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_bar_bg.9.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_bar_bg.9.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_bar_bg.9.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_blue.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_blue.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_blue.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_blue.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_green.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_green.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_green.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_green.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_red.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_red.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_red.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_red.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_white.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_white.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_white.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_white.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_yellow.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_yellow.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_yellow.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_yellow.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_blue.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_blue.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_blue.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_blue.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_green.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_green.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_green.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_green.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_red.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_red.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_red.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_red.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_white.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_white.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_white.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_white.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_yellow.png b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_yellow.png similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_yellow.png rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_yellow.png diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable/new_note.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable/new_note.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/drawable/new_note.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable/new_note.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_item.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_item.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_item.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_item.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_dropdown_menu.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_dropdown_menu.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_dropdown_menu.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_dropdown_menu.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_footer.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_footer.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_footer.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_footer.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/settings_header.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/settings_header.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/settings_header.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/settings_header.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_2x.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_2x.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_2x.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_2x.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_4x.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_4x.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_4x.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_4x.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_note_edit.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_note_edit.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_note_edit.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_note_edit.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_record_folder.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_record_folder.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_record_folder.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_record_folder.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_options.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_options.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_options.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_options.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/raw-zh-rCN/introduction b/src/Notes-master1/app/build/intermediates/packaged_res/debug/raw-zh-rCN/introduction similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/raw-zh-rCN/introduction rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/raw-zh-rCN/introduction diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/raw/introduction b/src/Notes-master1/app/build/intermediates/packaged_res/debug/raw/introduction similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/raw/introduction rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/raw/introduction diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/xml/preferences.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/preferences.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/xml/preferences.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/preferences.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/xml/searchable.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/searchable.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/xml/searchable.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/searchable.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_2x_info.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_2x_info.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_2x_info.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_2x_info.xml diff --git a/scr/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_4x_info.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_4x_info.xml similarity index 100% rename from scr/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_4x_info.xml rename to src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_4x_info.xml diff --git a/scr/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json rename to src/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json diff --git a/scr/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ similarity index 100% rename from scr/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ rename to src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex diff --git a/scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex similarity index 100% rename from scr/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex rename to src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex diff --git a/scr/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt similarity index 100% rename from scr/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt rename to src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt diff --git a/scr/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json rename to src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json diff --git a/scr/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt similarity index 100% rename from scr/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt rename to src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt diff --git a/scr/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt similarity index 100% rename from scr/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt rename to src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt diff --git a/scr/Notes-master1/app/build/intermediates/variant_model/debug/variant_model.json b/src/Notes-master1/app/build/intermediates/variant_model/debug/variant_model.json similarity index 100% rename from scr/Notes-master1/app/build/intermediates/variant_model/debug/variant_model.json rename to src/Notes-master1/app/build/intermediates/variant_model/debug/variant_model.json diff --git a/scr/Notes-master1/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk similarity index 100% rename from scr/Notes-master1/app/build/outputs/apk/debug/app-debug.apk rename to src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk diff --git a/scr/Notes-master1/app/build/outputs/apk/debug/output-metadata.json b/src/Notes-master1/app/build/outputs/apk/debug/output-metadata.json similarity index 100% rename from scr/Notes-master1/app/build/outputs/apk/debug/output-metadata.json rename to src/Notes-master1/app/build/outputs/apk/debug/output-metadata.json diff --git a/scr/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt similarity index 100% rename from scr/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt rename to src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt diff --git a/scr/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin similarity index 100% rename from scr/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin rename to src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin diff --git a/scr/Notes-master1/app/src/main/AndroidManifest.xml b/src/Notes-master1/app/src/main/AndroidManifest.xml similarity index 100% rename from scr/Notes-master1/app/src/main/AndroidManifest.xml rename to src/Notes-master1/app/src/main/AndroidManifest.xml diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java new file mode 100644 index 0000000..b53faea --- /dev/null +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/*Android SDK为 Android的软件开发工具箱,有: +* Android的扩展库,需要安装GoogleAPI +* 开发文档 +* Android附加支持文件 +* 平台工具 +* 示例工程 +* 工具 +* Android.jar +* 参考文档:https://www.runoob.com/android/android-architecture.html*/ +package net.micode.notes.data; +//在net包中的micode包中的notes包中的data包,声明该源文件中的类、函数放在了这个包 +//android.jar,Android库,为android开发的java库 +import android.content.Context; //内容包的Context类,content包时程序信息交流额的,这个类提供有关应用程序的全局信息 +import android.database.Cursor; //数据库包的Cursor类,数据库的指针 +import android.provider.ContactsContract.CommonDataKinds.Phone; //内容提供者包,联系规约类,普通数据子类,手机子类 +import android.provider.ContactsContract.Data; //内容提供包,联系规约类,数据类 +import android.telephony.PhoneNumberUtils; //电话包,电话号码工具类 +import android.util.Log; //工具包,日志类 + +import java.util.HashMap; //java库的工具包的哈希图类,用于索引 +//风格:类大写开头;变量、方法小写开头,单词首字母大写;常量全大写 +/* +* contact类,联系类 +* 属性: +* - sContactCache(HashMap) +* - TAG(String) +* - CALLER_ID_SELECTION(String) +* 方法: +* + String getContact(Context,String) +* */ + +public class Contact { //contact类 + private static HashMap sContactCache; //私有,静态 + private static final String TAG = "Contact"; //私有,静态,终态 + + private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER + + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + //MIMETYPE类型,IANA(互联网号码分配局) 媒体类型,结构为:type/subtype, + // https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Basics_of_HTTP/MIME_types + + " AND " + Data.RAW_CONTACT_ID + " IN " + + "(SELECT raw_contact_id " + + " FROM phone_lookup" + + " WHERE min_match = '+')"; + //输出示例:PHONE_NUMBERS_EQUAL(1122,?) AND text/plain='vnd.android.cursor.item/phone_v2' + // AND raw_contact_id IN (SELECT raw_contact_id FROM phone_lookup WHERE min_match = '+') + + /*getContact + * 输入:context(信息内容),phonenumber(通讯号码) + * 输出:string + * 功能:输入通讯信息和通讯号码,得到存储器中通讯号码对应的通讯地址值。 + * 流程:索引表为空则初始化 + * 1、索引表有通讯号码键则将通信号码对应的值作为函数结果返回; + * 2、若索引没有通信号码键,则 + * 1、创建selection和cursor + * 2、将cursor指向数据库中的包含五列内容的一行 + * 3、如果cursor指向第一个,则将通讯内容和通讯号码存入hash表并返回内容 + * 4、如果cursor无指向,则返回null*/ + + //HashMap.get(键)=值;HashMap.put(键,值)添加键值对,参考https://blog.csdn.net/aqiuisme/article/details/132634484 + public static String getContact(Context context, String phoneNumber) { + if(sContactCache == null) { + sContactCache = new HashMap(); //索引表初始化 + } + + if(sContactCache.containsKey(phoneNumber)) { + return sContactCache.get(phoneNumber); //如果哈希表中已有phonenumber键,则直接输出phonenumber键对应的值 + } + + String selection = CALLER_ID_SELECTION.replace("+", + PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); + //修改原先数据库语句Caller_ID_SELECTION,用函数形参phonenumber的后七位电话号码代替"+",因为int min_match=7,所以是七位 + Cursor cursor = context.getContentResolver().query( + //数据库中读取数据。cursor类是对数据库的操作,获取整行的数据.Ressolver是对联系人内容的读取,其中provider提供了联系人数据 + Data.CONTENT_URI, + new String [] { Phone.DISPLAY_NAME }, + selection, + new String[] { phoneNumber }, + null); + + if (cursor != null && cursor.moveToFirst()) { //cursor有指向且cursor指向第一个,判断查询结果,然后执行movtoFirst + try { + String name = cursor.getString(0); //把cursor指向的内容的第0列放入name变量,content_uri + sContactCache.put(phoneNumber, name); //把phonenumber:name作为一对键值存入hash表中 + return name; //将name变量,即值作为函数结果返回 + } catch (IndexOutOfBoundsException e) { //出错使用 索引出界错误类型 + Log.e(TAG, " Cursor get string error " + e.toString()); //记录下这个程序出错的错误信息 + return null; //返回null值 + } finally { + cursor.close(); //最后关闭指针 + } + } else { + Log.d(TAG, "No contact matched with number:" + phoneNumber); //如果指针没指向东西,则返回null值 + return null; + } + } +} diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java new file mode 100644 index 0000000..acba7d6 --- /dev/null +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java @@ -0,0 +1,341 @@ +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.micode.notes.data; //net包、micode包、notes包、data包中的notes类 + +import android.net.Uri; //导入Android库中的net包中的Uri类 +/* +* Notes类 +* 属性: +* + AUTHORITY(String) --作者:micode +* + TAG(String) --标签:Notes包 +* + TYPE_NOTE(int) --笔记类型:0 +* + TYPE_FOLDER(int) --文件夹类型:1 +* + TYPE_SYSTEM(int) --系统类型:2 +* + ID_ROOT_FOLDER(int) --ID_根文件夹:0,默认文件夹 +* + ID_TEMPARAY_FOLDER(int) --ID_临时文件夹:-1,无文件夹文件存储处 +* + ID_CALL_RECORD_FOLDER(int) --ID_通知记录文件夹:-2,存储通知记录 +* + ID_TRASH_FOLDER(int) --ID_垃圾文件夹:-3,回收站 +* + INTENT_EXTRA_ALERT_DATE --用于传递提醒日期 +* + INTENT_EXTRA_BACKGROUND_ID --用于传递背景颜色id +* + INTENT_EXTRA_WIDGET_ID --用于传递组件id +* + INTENT_EXTRA_WIDGET_TYPE --用于传递组件类型 +* + INTENT_EXTRA_FOLDER_ID --用于传递文件夹id +* + INTENT_EXTRA_CALL_DATE --用于传递通信日期 +* + TYPE_WIDGET_INVALIDE --桌面小部件失效类型:-1 +* + TYPE_WIDGET_2X --2倍大小的桌面小组件类型:0 +* + TYPE_WIDGET_4X --4倍大小的桌面小组件类型:1); +* +*/ +public class Notes { //notes类,包括了20个属性,2个接口和3个内部类,用于构建便签数据库。 + public static final String AUTHORITY = "micode_notes"; //+ AUTHORITY(String) --作者:micode + public static final String TAG = "Notes"; //+ TAG(String) --标签:Notes包 + public static final int TYPE_NOTE = 0; //+ TYPE_NOTE(int) --笔记类型:0 + public static final int TYPE_FOLDER = 1; //+ TYPE_FOLDER(int) --文件夹类型:1 + public static final int TYPE_SYSTEM = 2; //+ TYPE_SYSTEM(int) --系统类型:2 + + /** + * Following IDs are system folders' identifiers + * {@link Notes#ID_ROOT_FOLDER } is default folder + * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder + * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records + */ + public static final int ID_ROOT_FOLDER = 0; //+ ID_ROOT_FOLDER(int) --ID_根文件夹:0,默认文件夹 + public static final int ID_TEMPARAY_FOLDER = -1; //+ ID_TEMPARAY_FOLDER(int) --ID_临时文件夹:-1,无文件夹文件存储处 + public static final int ID_CALL_RECORD_FOLDER = -2; //+ ID_CALL_RECORD_FOLDER(int) --ID_通知记录文件夹:-2,存储通知记录 + public static final int ID_TRASH_FOLER = -3; //+ ID_TRASH_FOLDER(int) --ID_垃圾文件夹:-3,回收站 + //Android的intent机制的详解:https://blog.csdn.net/JMW1407/article/details/114932159 + //Android四大件:https://blog.csdn.net/xchaha/article/details/80398620 + //都是些Intent,用来激活组件活动,是一种运行绑定机制 + /*Intent 是 Android 应用程序中用于在不同组件之间进行通信的一种机制。通过使用 Intent, + 您可以在不同的活动、服务和广播接收器之间传递数据、启动活动或触发其他操作。 + 为了确保 Intent 的一致性和可读性,Android 提供了一些预定义的常量, + 这些常量可以用作 Intent 中的键(key),以便在不同的组件之间传递特定的信息。*/ + public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date"; //+ INTENT_EXTRA_ALERT_DATE --用于传递提醒日期 + public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id"; //+ INTENT_EXTRA_BACKGROUND_ID --用于传递背景颜色id + public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";//+ INTENT_EXTRA_WIDGET_ID --用于传递组件id + public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type";//+ INTENT_EXTRA_WIDGET_TYPE --用于传递组件类型 + public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";//+ INTENT_EXTRA_FOLDER_ID --用于传递文件夹id + public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date";//+ INTENT_EXTRA_CALL_DATE --用于传递通信日期 + + public static final int TYPE_WIDGET_INVALIDE = -1; //+ TYPE_WIDGET_INVALIDE --桌面小部件失效类型:-1 + public static final int TYPE_WIDGET_2X = 0; //+ TYPE_WIDGET_2X --2倍大小的桌面小组件类型:0 + public static final int TYPE_WIDGET_4X = 1; //+ TYPE_WIDGET_4X --4倍大小的桌面小组件类型:1 + + public static class DataConstants { //内部类,数据常量,存放文本数据和通信数据的内容项目类型 + public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; //存放文本数据的内容项目类型在note变量中 + public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; //存放通信数据的内容项目类型在call_note变量中 + } + + //uri:unified resource identity,统一资源区分符 + /** + * Uri to query all notes and folders + */ + public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); + //笔记uri查询所有笔记和文件夹,格式示例:content://wukaka/note + + /** + * Uri to query data + */ + public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); + //使用uri查询日期,格式示例:content://wukaka/data + public interface NoteColumns { //笔记列表,接口,为数据库做准备,定义Note的一系列属性,供调用 + /* + * create table NOTE( + * _id int primary key, --主键 + * parent_id varchar(20), + * created_date varchar(20), + * modified_date varchar(20), + * alerted_date varchar(20), + * snippet varchar(20), + * widget_id varchar(20), + * widget_type varchar(20), + * bg_color_id varchar(20), + * has_attachment varchar(20), + * notes_count varchar(20), + * type varchar(20), + * sync_id varchar(20), + * local_modified varchar(20), + * origin_parent_id varchar(20), + * gtask_id varchar(20), + * version varchar(20));*/ + /** + * The unique ID for a row + *

Type: INTEGER (long)

+ */ + public static final String ID = "_id"; //主键,笔记ID,“_id” + + /** + * The parent's id for note or folder + *

Type: INTEGER (long)

+ */ + public static final String PARENT_ID = "parent_id"; //notes属性之一,父笔记或文件夹ID,“parent_id” + + /** + * Created data for note or folder + *

Type: INTEGER (long)

+ */ + public static final String CREATED_DATE = "created_date"; //notes属性之一,笔记创建日期,"created_date" + + /** + * Latest modified date + *

Type: INTEGER (long)

+ */ + public static final String MODIFIED_DATE = "modified_date"; //notes属性之一,笔记修改日期,“modified_date" + + + /** + * Alert date + *

Type: INTEGER (long)

+ */ + public static final String ALERTED_DATE = "alert_date"; //notes属性之一,提醒日期,"alert_date" + + /** + * Folder's name or text content of note + *

Type: TEXT

+ */ + public static final String SNIPPET = "snippet"; //notes属性之一,短文本,一般为文件夹名字和笔记内容,"snippet" + + /** + * Note's widget id + *

Type: INTEGER (long)

+ */ + public static final String WIDGET_ID = "widget_id"; //notes属性之一,笔记小组件ID,"widgt_id" + + /** + * Note's widget type + *

Type: INTEGER (long)

+ */ + public static final String WIDGET_TYPE = "widget_type"; //notes属性之一,笔记小组件类型,"widget_type" + + /** + * Note's background color's id + *

Type: INTEGER (long)

+ */ + public static final String BG_COLOR_ID = "bg_color_id"; //notes属性之一,笔记背景颜色ID,”bg_color_id" + + /** + * For text note, it doesn't has attachment, for multi-media + * note, it has at least one attachment + *

Type: INTEGER

+ */ + public static final String HAS_ATTACHMENT = "has_attachment"; //notes属性之一。有附件标识,"has_attachment" + + /** + * Folder's count of notes + *

Type: INTEGER (long)

+ */ + public static final String NOTES_COUNT = "notes_count"; //notes属性之一,笔记数量,"notes_cont" + + /** + * The file type: folder or note + *

Type: INTEGER

+ */ + public static final String TYPE = "type"; //notes属性之一,文件夹或笔记的类型标识,“type" + + /** + * The last sync id + *

Type: INTEGER (long)

+ */ + public static final String SYNC_ID = "sync_id"; //notes属性之一,最新同步ID,”sync_id“ + + /** + * Sign to indicate local modified or not + *

Type: INTEGER

+ */ + public static final String LOCAL_MODIFIED = "local_modified"; //notes属性之一,本地修改标志,”local_modified“ + + /** + * Original parent id before moving into temporary folder + *

Type : INTEGER

+ */ + public static final String ORIGIN_PARENT_ID = "origin_parent_id"; //notes属性之一,原父文件id(在移动至临时文件夹之前) + + /** + * The gtask id + *

Type : TEXT

+ */ + public static final String GTASK_ID = "gtask_id"; //notes属性之一,GOOGLE TASK,"gtask_id" + + /** + * The version code + *

Type : INTEGER (long)

+ */ + public static final String VERSION = "version"; //notes属性之一,版本升级所用,整型,当前版本的编号 + } + + public interface DataColumns { //接口,一系列常量,定义了data的一系列属性列,为数据库做准备 + /*创建data表的SQL语句 + * create table DATA( + * _id int primary key, --主键 + * mime_type text, --mime_type + * note_id int, -- + * created_date int, + * modified_date int, + * content text, + * data1 varchar2(20), + * data2 varchar2(20), + * data3 varchar2(20), + * data4 varchar2(20), + * data5 varchar2(20));*/ + /** + * The unique ID for a row + *

Type: INTEGER (long)

+ */ + public static final String ID = "_id"; //data表的主键,data的唯一标识符,命名为“_id” + + /** + * The MIME type of the item represented by this row. + *

Type: Text

+ */ + public static final String MIME_TYPE = "mime_type"; //data表的属性之一,“MIME_TYPE” + + /** + * The reference id to note that this data belongs to + *

Type: INTEGER (long)

+ */ + public static final String NOTE_ID = "note_id"; //data表的属性之一,笔记id,"NOTE_ID" + + /** + * Created data for note or folder + *

Type: INTEGER (long)

+ */ + public static final String CREATED_DATE = "created_date"; //data表的属性之一,创建日期,“created_date" + + /** + * Latest modified date + *

Type: INTEGER (long)

+ */ + public static final String MODIFIED_DATE = "modified_date"; //data表的属性之一,修改日期,"modified_date" + + /** + * Data's content + *

Type: TEXT

+ */ + public static final String CONTENT = "content"; //data表的属性之一,内容,”content“ + + + /** + * Generic data column, the meaning is {@link #MIMETYPE} specific, used for + * integer data type + *

Type: INTEGER

+ */ + public static final String DATA1 = "data1"; //data表的属性之一 + + /** + * Generic data column, the meaning is {@link #MIMETYPE} specific, used for + * integer data type + *

Type: INTEGER

+ */ + public static final String DATA2 = "data2"; //data表的属性之一 + + /** + * Generic data column, the meaning is {@link #MIMETYPE} specific, used for + * TEXT data type + *

Type: TEXT

+ */ + public static final String DATA3 = "data3"; //data表的属性之一 + + /** + * Generic data column, the meaning is {@link #MIMETYPE} specific, used for + * TEXT data type + *

Type: TEXT

+ */ + public static final String DATA4 = "data4"; //data表的属性之一 + + /** + * Generic data column, the meaning is {@link #MIMETYPE} specific, used for + * TEXT data type + *

Type: TEXT

+ */ + public static final String DATA5 = "data5"; //data表的属性之一 + } + + public static final class TextNote implements DataColumns { //内部类,文本数据,实现数据属性接口 + /** + * Mode to indicate the text in check list mode or not + *

Type: Integer 1:check list mode 0: normal mode

+ */ + public static final String MODE = DATA1; //接口常量DATA1赋值给MODE变量,表示文本状态 + + public static final int MODE_CHECK_LIST = 1; //便签模式,1表示check_list模式(待办?),0表示文本模式 + + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note"; //内容类型 + + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; //内容项目类型 + + public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); //内容URI格式 + } + + public static final class CallNote implements DataColumns { //内部类,通话数据,结构实施数据属性类接口 + /** + * Call date for this record + *

Type: INTEGER (long)

+ */ + public static final String CALL_DATE = DATA1; //接口常量DATA1赋值给CALL_DATE变量 + + /** + * Phone number for this record + *

Type: TEXT

+ */ + public static final String PHONE_NUMBER = DATA3; //接口常量DATA3赋值给该变量,表示电话号码 + + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note"; //内容类型 + + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note"; //内容项目类型 + + public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); //内容uri + } +} diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java new file mode 100644 index 0000000..09eab15 --- /dev/null +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.micode.notes.gtask.data; + +import android.database.Cursor; +import android.util.Log; + +import net.micode.notes.tool.GTaskStringUtils; + +import org.json.JSONException; +import org.json.JSONObject; + + +public class MetaData extends Task {//新建一个继承Task类的MetaData类,该类主要用于记录数据的变化,作为元数据类描述数据属性的信息 + private final static String TAG = MetaData.class.getSimpleName();//调用getSimpleName ()函数来得到类的简写名称存入字符串TAG中 + + private String mRelatedGid = null;//创建私有变量mRelatedGid,并初始化为null + + public void setMeta(String gid, JSONObject metaInfo) {//调用JSONObject库函数put (),Task类中的setNotes ()和setName ()函数,实现设置数据,即生成元数据库 + try { + metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);//将这对键值放入metaInfo这个jsonobject对象中 + } catch (JSONException e) {//捕捉异常放入TAG + Log.e(TAG, "failed to put related gid");//报错 + } + setNotes(metaInfo.toString());//设置便签,将json类的metaInfo转为string + setName(GTaskStringUtils.META_NOTE_NAME);//设置gtask名字 + } + + public String getRelatedGid() { + return mRelatedGid; + }//获取相关联的Gid + + @Override + public boolean isWorthSaving() { + return getNotes() != null; + }//判断是否值得存放,即当前数据是否有效,若数据非空则返回真值 + + @Override + public void setContentByRemoteJSON(JSONObject js) {//调用父类Task中的setContentByRemoteJSON ()函数,使用远程json数据对象设置元数据内容 + super.setContentByRemoteJSON(js);//super可以理解为是指向自己超(父)类对象的一个指针,而这个超类指的是离自己最近的一个父类 + if (getNotes() != null) {//如果获取的 Notes 非空 + try {//捕捉异常,获取关联 Gid 失败 + JSONObject metaInfo = new JSONObject(getNotes().trim());//trim():去掉字符串首尾的空格 + mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID); + } catch (JSONException e) {//用catch进行异常处理 + Log.w(TAG, "failed to get related gid");//输出警告信息 + mRelatedGid = null; + } + } + } + + @Override + public void setContentByLocalJSON(JSONObject js) {//使用本地json数据对象设置元数据内容,一般不会用到,若用到,则抛出异常 + // this function should not be called + throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");//抛出非法参数异常 + } + + @Override + public JSONObject getLocalJSONFromContent() {//从元数据内容中获取本地json对象,一般不会用到,若用到,则抛出异常 + throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");//传递非法参数异常 + } + + @Override + public int getSyncAction(Cursor c) {//获取同步动作状态,一般不会用到,若用到,则抛出异常 + throw new IllegalAccessError("MetaData:getSyncAction should not be called");//传递非法参数异常 + } + +} diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java new file mode 100644 index 0000000..5731ca7 --- /dev/null +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.micode.notes.gtask.data;//包名,说明依赖关系 + +import android.database.Cursor; + +import org.json.JSONObject; + +public abstract class Node {//包名,说明依赖关系 + public static final int SYNC_ACTION_NONE = 0;//本地和云端内容一致,不需要更新 + + public static final int SYNC_ACTION_ADD_REMOTE = 1;//需要在远程云端增加内容 + + public static final int SYNC_ACTION_ADD_LOCAL = 2;//需要在本地增加内容 + + public static final int SYNC_ACTION_DEL_REMOTE = 3;//需要在远程云端删除内容 + + public static final int SYNC_ACTION_DEL_LOCAL = 4;//需要在本地删除内容 + + public static final int SYNC_ACTION_UPDATE_REMOTE = 5;//需要将本地内容更新到远程云端 + + public static final int SYNC_ACTION_UPDATE_LOCAL = 6;//需要将远程云端内容更新到本地 + + public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;//同步更新发生冲突 + + public static final int SYNC_ACTION_ERROR = 8;//同步出现错误 + + private String mGid;//记录最后一次修改时间 + + private String mName;//记录是否被删除 + + private long mLastModified;//记录是否被删除 + + private boolean mDeleted;//bool类型,表明是否被删除 + + public Node() { + mGid = null; + mName = ""; + mLastModified = 0; + mDeleted = false; + }//构造函数,进行初始化,界面没有,名字为空,最后一次修改时间为0(没有修改),表征是否删除。 + + public abstract JSONObject getCreateAction(int actionId);//创建JSONObject对象,创建操作和更新操作,形参是操作号 + + public abstract JSONObject getUpdateAction(int actionId);//创建一个json对象,获取更新活动的id + + public abstract void setContentByRemoteJSON(JSONObject js);//主要功能:声明JSONObject对象抽象类,从远端JSON中同步设置目录 + + public abstract void setContentByLocalJSON(JSONObject js);//主要功能:声明JSONObject对象抽象类,从本地JSON中同步设置目录 + + public abstract JSONObject getLocalJSONFromContent();//主要功能:声明JSONObject对象抽象类,从目录中获取本地JSON + + public abstract int getSyncAction(Cursor c);//主要功能:声明int抽象类,获取同步行为代号 + + public void setGid(String gid) { + this.mGid = gid; + }//设置gid,将gid赋给mGid,以下均为Node函数参数的输入与赋值 + + public void setName(String name) { + this.mName = name; + }//设置名称 + + public void setLastModified(long lastModified) { + this.mLastModified = lastModified; + }//设置最新修改时间 + + public void setDeleted(boolean deleted) { + this.mDeleted = deleted; + }//设置删除标识 + + public String getGid() { + return this.mGid; + }//获取 gid + + public String getName() { + return this.mName; + }//获取名称 + + public long getLastModified() { + return this.mLastModified; + }//获取最近修改标识 + + public boolean getDeleted() { + return this.mDeleted; + }//获取删除标识 + +} diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java new file mode 100644 index 0000000..da4abee --- /dev/null +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java @@ -0,0 +1,190 @@ +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.micode.notes.gtask.data;//包名,说明归属关系 + +import android.content.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.net.Uri; +import android.util.Log; + +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.DataColumns; +import net.micode.notes.data.Notes.DataConstants; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.data.NotesDatabaseHelper.TABLE; +import net.micode.notes.gtask.exception.ActionFailureException; + +import org.json.JSONException; +import org.json.JSONObject; + + +public class SqlData {//类:用于支持小米便签最底层的数据库相关操作,和SqlNote的关系上是子集关系,即data是note的子集(节点)。SqlData其实就是也就是所谓数据中的数据 + private static final String TAG = SqlData.class.getSimpleName();//调用getSimpleName ()函数来得到类的简写名称存入字符串TAG中 + + private static final int INVALID_ID = -99999;//将 INVALID_ID初始化为-99999 + + public static final String[] PROJECTION_DATA = new String[] {//新建一个字符串数组,集合了 interface DataColumns 中所有SF常量 + DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1, + DataColumns.DATA3//获得数据列id,mime类型,内容,1类型数据,3类型数据 + }; +//以下五个变量作为数据库表中5列的编号 + public static final int DATA_ID_COLUMN = 0;//在数据库中,表头的每一列都有一个名字,这里0号列名称为DATA_ID_COLUMN + + public static final int DATA_MIME_TYPE_COLUMN = 1;//数据列的这一行表示的项的mime类型 + + public static final int DATA_CONTENT_COLUMN = 2;//数据列的上下文content声明常量2 + + public static final int DATA_CONTENT_DATA_1_COLUMN = 3;//用于整型的通用数据列声明常量3 + + + public static final int DATA_CONTENT_DATA_3_COLUMN = 4;//用于文本型的通用数据列声明常量4,以上就是一个SQL表中5列的标号及其代表的意义 + + private ContentResolver mContentResolver;//定义私有的全局变量,与后来的SqlNote对应 + + private boolean mIsCreate;//如果sqldata是由数据库游标直接生成,则本参数设置为false,若由默认构造函数生成,则为true + + private long mDataId;//以下五个变量分别对应上述5列类型,用于构造SqlData,声明为private类型,以防止被恶意篡改。 + + private String mDataMimeType;//数据mime类型 + + private String mDataContent;//数据内容 + + private long mDataContentData1;//数据内容中的1类型数据 + + private String mDataContentData3;//数据内容中的3类型数据 + + private ContentValues mDiffDataValues;//定义contenvalues存储基本类型的数据,像string,int之类的;定义mDiffDataValues用于构造SqiData,操作数据库 + + public SqlData(Context context) {//构造函数,初始化数据,参数类型为Context + mContentResolver = context.getContentResolver();//获取ContentResovler对象,如果需要查询数据,可以直接在mContetResolver上操作 + mIsCreate = true;//记录当前数据构造方式 + mDataId = INVALID_ID;//mDataId 设置为无效id,初始值-99999 + mDataMimeType = DataConstants.NOTE;//设置数据mime类型为note + mDataContent = "";//mDiffDataValues用于构造SqlData,操纵数据库 + mDataContentData1 = 0; + mDataContentData3 = ""; + mDiffDataValues = new ContentValues();//创建内容 + } + + public SqlData(Context context, Cursor c) {//构造函数,与上一个构造函数现了构造函数的多态性,且这三个构造函数可以与sqlNote的构造函数进行比较分析 + mContentResolver = context.getContentResolver();//获取ContentProvider提供的数据 + mIsCreate = false;//记录当前数据创建方式 + loadFromCursor(c);//从光标处载入数据 + mDiffDataValues = new ContentValues(); + } + + private void loadFromCursor(Cursor c) {//从光标c处加载数据,帮助实现SqlData的第二种构造,将5列的数据赋给该类的对象 + mDataId = c.getLong(DATA_ID_COLUMN);//调用cursor类的方法,获取数据id,参数为id长度 + mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);//调用cursor类的方法,获取数据mime类型,参数为其长度 + mDataContent = c.getString(DATA_CONTENT_COLUMN);//调用cursor类的方法,获取数据内容,参数为其长度 + mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN); + mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN); + } + + public void setContent(JSONObject js) throws JSONException {//设置用于共享的数据,并提供异常抛出与处理机制,其中很多if 条件语句的判断,某些条件下某些特定的操作 + long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;//设置数据 id,如果传入的 JSONObject 对象中存在DataColumns.ID则获取并设置,否则设为INVALID_ID + if (mIsCreate || mDataId != dataId) {//如果采用的是第一种SqlData构造方式,或者这个对象的ID不是共享数据ID,则将共享数据ID加入数据库中 + mDiffDataValues.put(DataColumns.ID, dataId);//将DataColumns.ID列和对应dataId列值加入到SQLData中 + } + mDataId = dataId;//与共享数据库同步后,共享数据ID就等于数据ID + + String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE)//若json中有MIME_TYPE这一项,则将其获取,否则,将其定义为notes类中定义的文本类型 + : DataConstants.NOTE; + if (mIsCreate || !mDataMimeType.equals(dataMimeType)) {//如果采用的是第一种SqlData构造方式,或者这个对象的MimeType不和共享数据一样,则将共享数据.MIME_TYPE加入数据库中 + mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType);//那么就把这个数据mime类型添加到数据库这一数据mime类型列中 + } + mDataMimeType = dataMimeType;//共享数据同步后,共享数据mime类型等于该数据mime类型 + + String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : "";//如果传入的JSONObject对象有DataColumn.CONTENT一项,那么将其获取,否则。将其设置为"" + if (mIsCreate || !mDataContent.equals(dataContent)) {//如果是第一种sqldata函数,或者该数据内容和共享数据内容不同,将内容数据加入数据库 + mDiffDataValues.put(DataColumns.CONTENT, dataContent);//那么就把这个数据内容添加到数据库这一数据内容列中 + } + mDataContent = dataContent;//共享数据同步后,共享数据内容等于该数据内容 + + long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0;//如果传入的JSONObject对象有DataColumn.DATA1,获取数据,否则将其设置为0 + if (mIsCreate || mDataContentData1 != dataContentData1) {//如果是第一种sqldata函数,或者该1类型数据和共享1类型数据不同,加入数据库 + mDiffDataValues.put(DataColumns.DATA1, dataContentData1);//共享数据同步后,共享1类型数据等于该1类型数据 + } + mDataContentData1 = dataContentData1;//共享数据同步后,共享1类型数据等于该1类型数据 + + String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : "";// 如果传入的JSONObject对象有DataColumn.DATA3一项,那么将其获取,否则。将其设置为空 + if (mIsCreate || !mDataContentData3.equals(dataContentData3)) {//如果是第一种sqldata函数,或者该3类型数据和共享3类型数据不同,加入数据库 + mDiffDataValues.put(DataColumns.DATA3, dataContentData3); + } + mDataContentData3 = dataContentData3;//共享数据同步后,共享3类型数据等于该3类型数据 + } + + public JSONObject getContent() throws JSONException {//获取共享的数据内容,并提供异常抛出与处理机制 + if (mIsCreate) { + Log.e(TAG, "it seems that we haven't created this in database yet");//判断是否在数据库中创建这个数据 + return null; + } + JSONObject js = new JSONObject();//SQLdata采用第二种构造方式,创建JSONObject对象,并将相关数据放入其中,并返回 + js.put(DataColumns.ID, mDataId);//将JSON中放入数据,这个JSON一共有五个数据,对应着SqlData中的五行数据 + js.put(DataColumns.MIME_TYPE, mDataMimeType); + js.put(DataColumns.CONTENT, mDataContent); + js.put(DataColumns.DATA1, mDataContentData1); + js.put(DataColumns.DATA3, mDataContentData3); + return js; + } + + public void commit(long noteId, boolean validateVersion, long version) {//commit 函数用于把当前所做的修改保存到数据库 + + if (mIsCreate) { + if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {//如果该id是无效id且在共享数据中不存在该数据id对应的键,则从共享数据中移除 + mDiffDataValues.remove(DataColumns.ID); + } + + mDiffDataValues.put(DataColumns.NOTE_ID, noteId);//加入的ID有效,也就是操作有效,则数据库加入这个note的ID,这条data对应在这个note的ID下 + Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);//在note的资源标识下加入data数据,并往URI中插入共享数据 + try { + mDataId = Long.valueOf(uri.getPathSegments().get(1));//获取有效便签id并创建 + } catch (NumberFormatException e) {//如果转换出错则显示错误“获取note的ID出错,创建note失败” + Log.e(TAG, "Get note id error :" + e.toString()); + throw new ActionFailureException("create note failed"); + } + } else { + if (mDiffDataValues.size() > 0) {//整个判断语句结构目的在于判断非有效ID版本下ID数据的更新以及更新完成后不需要更新的log文本提示 + int result = 0; + if (!validateVersion) {//如果版本还没确认,则结果记录下的只是data的ID,还有data内容 + result = mContentResolver.update(ContentUris.withAppendedId(//如果版本还没有确认,则记录id和data + Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null); + } else {//如果版本确认了,则从数据库中选取对应版本的id进行更新 + result = mContentResolver.update(ContentUris.withAppendedId( + Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, + " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE + + " WHERE " + NoteColumns.VERSION + "=?)", new String[] { + String.valueOf(noteId), String.valueOf(version) + }); + } + if (result == 0) {//更新不存在,可能是用户在同步时已更新 + Log.w(TAG, "there is no update. maybe user updates note when syncing");//如果更新不存在(或许用户在同步时已经完成更新),则报错 + } + } + } + + mDiffDataValues.clear();//回到初始化,清空,表示已经更新 + mIsCreate = false; + } + + public long getId() { + return mDataId; + }//获取当前id +} diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java new file mode 100644 index 0000000..ef94638 --- /dev/null +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java @@ -0,0 +1,505 @@ +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.micode.notes.gtask.data;//用于支持小米便签最底层的数据库相关操作,note是data的子父集 + +import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.net.Uri; +import android.util.Log; + +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.DataColumns; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.gtask.exception.ActionFailureException; +import net.micode.notes.tool.GTaskStringUtils; +import net.micode.notes.tool.ResourceParser; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; + + +public class SqlNote {//调用getSimpleName ()函数得到类的简写名称存入字符串TAG中 + private static final String TAG = SqlNote.class.getSimpleName(); + + private static final int INVALID_ID = -99999;//将INVALID_ID 初始化为-99999 + + public static final String[] PROJECTION_NOTE = new String[] {//集合了interface NoteColumns中所有17个SF常量 + NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID, + NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE, + NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE, + NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID, + NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID, + NoteColumns.VERSION + };//以下设置17个列的编号 + + public static final int ID_COLUMN = 0; + + public static final int ALERTED_DATE_COLUMN = 1;//提醒时间 + + public static final int BG_COLOR_ID_COLUMN = 2;//背景颜色 + + public static final int CREATED_DATE_COLUMN = 3;//创建时间 + + public static final int HAS_ATTACHMENT_COLUMN = 4;//有无附件 + + public static final int MODIFIED_DATE_COLUMN = 5;//修改时间 + + public static final int NOTES_COUNT_COLUMN = 6;//便签数 + + public static final int PARENT_ID_COLUMN = 7;//父节点ID + + public static final int SNIPPET_COLUMN = 8;//文本片段 + + public static final int TYPE_COLUMN = 9;//文件类型 + + public static final int WIDGET_ID_COLUMN = 10;//小部件ID + + public static final int WIDGET_TYPE_COLUMN = 11;//小部件种类 + + public static final int SYNC_ID_COLUMN = 12;//同步ID + + public static final int LOCAL_MODIFIED_COLUMN = 13;//本地修改 + + public static final int ORIGIN_PARENT_ID_COLUMN = 14;//原始父文件夹ID + + public static final int GTASK_ID_COLUMN = 15;//用户ID + + public static final int VERSION_COLUMN = 16;//版本号 + + private Context mContext;//以下定义了17个内部变量,其中12个可以由content获得,5个需要初始化为0或者new + + private ContentResolver mContentResolver; + + private boolean mIsCreate; + + private long mId; + + private long mAlertDate; + + private int mBgColorId; + + private long mCreatedDate; + + private int mHasAttachment; + + private long mModifiedDate; + + private long mParentId; + + private String mSnippet; + + private int mType; + + private int mWidgetId; + + private int mWidgetType; + + private long mOriginParent; + + private long mVersion; + + private ContentValues mDiffNoteValues; + + private ArrayList mDataList; + + public SqlNote(Context context) {//构造函数,参数只有context,初始化新建的对象中的所有变量 + mContext = context;//获取context程序间共享数据 + mContentResolver = context.getContentResolver(); + mIsCreate = true; + mId = INVALID_ID;//无效用户 + mAlertDate = 0; + mBgColorId = ResourceParser.getDefaultBgId(context);//系统默认背景 + mCreatedDate = System.currentTimeMillis();//创建时间默认为系统当前时间 + mHasAttachment = 0; + mModifiedDate = System.currentTimeMillis();//调用系统函数获得创建时间 + mParentId = 0;//父Id初始为0 + mSnippet = "";//摘要初始化为空 + mType = Notes.TYPE_NOTE; + mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;//控件id初始化 + mWidgetType = Notes.TYPE_WIDGET_INVALIDE;//控件类型初始化 + mOriginParent = 0;//窗口部件种类 + mVersion = 0;//用户版本类型 + mDiffNoteValues = new ContentValues();//新建一个NoteValues值,用来记录改变的values + mDataList = new ArrayList();//新建一个data的列表 + } + + public SqlNote(Context context, Cursor c) {//构造函数有context和一个数据库的cursor两个参数,多数变量通过cursor指向的一条记录直接进行初始化 + mContext = context;//数据表初始化 + mContentResolver = context.getContentResolver();//通过光标和context初始化方法 + mIsCreate = false; + loadFromCursor(c); + mDataList = new ArrayList(); + if (mType == Notes.TYPE_NOTE)//如果是note类型,则调用下面的 loadDataContent()函数,加载数据内容 + loadDataContent(); + mDiffNoteValues = new ContentValues(); + } + + public SqlNote(Context context, long id) {//构造函数,参数有 context 和 id,对 id 指向的对象进行初始化 + mContext = context; + mContentResolver = context.getContentResolver(); + mIsCreate = false; + loadFromCursor(id);//调用下面的 loadFromCursor函数,通过ID从光标处加载数据 + mDataList = new ArrayList(); + if (mType == Notes.TYPE_NOTE)//如果是数据是便签类型,则加载数据内容 + loadDataContent(); + mDiffNoteValues = new ContentValues(); + + } + + private void loadFromCursor(long id) {//通过id从光标处加载数据 + Cursor c = null; + try {//通过try避免异常 + c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",//通过id获得对应的ContentResolver中的cursor + new String[] { + String.valueOf(id) + }, null);//如果获取成功,则cursor移动到下一条记录,并加载该记录 + if (c != null) {//如果有内容就将移入文档,并再次等待光标的内容 + c.moveToNext(); + loadFromCursor(c); + } else {//否则日志显示警告 + Log.w(TAG, "loadFromCursor: cursor = null"); + } + } finally { + if (c != null)//执行完后关闭释放 + c.close();//关闭光标,方法完毕 + } + } + + private void loadFromCursor(Cursor c) {//通过游标从光标处加载数据 + mId = c.getLong(ID_COLUMN);//直接从一条记录中的获得以下变量的初始值 + mAlertDate = c.getLong(ALERTED_DATE_COLUMN); + mBgColorId = c.getInt(BG_COLOR_ID_COLUMN); + mCreatedDate = c.getLong(CREATED_DATE_COLUMN); + mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN); + mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN); + mParentId = c.getLong(PARENT_ID_COLUMN); + mSnippet = c.getString(SNIPPET_COLUMN); + mType = c.getInt(TYPE_COLUMN); + mWidgetId = c.getInt(WIDGET_ID_COLUMN); + mWidgetType = c.getInt(WIDGET_TYPE_COLUMN); + mVersion = c.getLong(VERSION_COLUMN); + } + + private void loadDataContent() {//通过content机制获取共享数据并加载到数据库当前游标处 + Cursor c = null; + mDataList.clear();//先对cursor和数据表清空 + try {//获取ID对应content内容 + c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA,//获得该ID对应的数据内容 + "(note_id=?)", new String[] { + String.valueOf(mId) + }, null); + if (c != null) {//查询到该note的id确实有对应项,即cursor有对应 + if (c.getCount() == 0) { + Log.w(TAG, "it seems that the note has not data"); + return; + }//如果光标处无内容,提示note无数据warning + while (c.moveToNext()) { + SqlData data = new SqlData(mContext, c); + mDataList.add(data);//记录数量不为0,则循环直到记录不存在,不断地取出记录放到DataList中 + } + } else { + Log.w(TAG, "loadDataContent: cursor = null"); + }//cursor没有对应的记录,警告 + } finally { + if (c != null) + c.close(); + }//无论如何,最后需要关闭数据库游标 + } + + public boolean setContent(JSONObject js) {//无论如何,最后需要关闭数据库游标 + try { + JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);//创建一个JSONObject对象note + if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {// 语句:判断是不是系统文件夹 + Log.w(TAG, "cannot set system folder");//警告,不能设置系统文件夹 + } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {//判断是否为文件夹类型 + // for folder we can only update the snnipet and type + String snippet = note.has(NoteColumns.SNIPPET) ? note//如果共享数据存在摘要,则将其赋给snippet变量,否则该变量为空 + .getString(NoteColumns.SNIPPET) : ""; + if (mIsCreate || !mSnippet.equals(snippet)) {//如果没有创建或者该摘要没有匹配原摘要则将其加入解析器 + mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); + } + mSnippet = snippet;//将该摘要覆盖原摘要 + + int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)// 以下操作都和上面对snippet的操作一样,一起根据共享的数据设置SqlNote内容的上述17项 + : Notes.TYPE_NOTE; + if (mIsCreate || mType != type) {//如果是新建的或 type 不匹配 + mDiffNoteValues.put(NoteColumns.TYPE, type);//对便签的更新能包括对象中大部分的数据 + } + mType = type;//将该类型覆盖原类型 + } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {//如果不是文件夹而是note,则进入 + JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);//获取便签提示日期 + long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;//获取数据的ID + if (mIsCreate || mId != id) {//如果只是通过上下文对note进行数据库操作,或者该ID与原ID不相同, + mDiffNoteValues.put(NoteColumns.ID, id);//对背景颜色操作 + } + mId = id;//将该ID覆盖原ID + + long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note//获取数据的提醒日期 + .getLong(NoteColumns.ALERTED_DATE) : 0; + if (mIsCreate || mAlertDate != alertDate) {//如果只是通过上下文对note进行数据库操作,或者该提醒日期与原提醒日期不相同 + mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate);//将该提醒日期保存在mDiffNoteValue这个变量中,说明这两个值不相同 + } + mAlertDate = alertDate;//将该提醒日期覆盖原提醒日期 + + int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note//获取数据的背景颜色 + .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext); + if (mIsCreate || mBgColorId != bgColorId) {//如果只是通过上下文对note进行数据库操作,或者该背景颜色与原背景颜色不相同 + mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId);// 将该背景颜色保存在mDiffNoteValue这个变量中,说明这两个值不相同 + } + mBgColorId = bgColorId;//将该背景颜色覆盖原背景颜色 + + long createDate = note.has(NoteColumns.CREATED_DATE) ? note//获取数据的创建日期 + .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis(); + if (mIsCreate || mCreatedDate != createDate) {//如果只是通过上下文对note进行数据库操作,或者该创建日期与原创建日期不相同 + mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate);//将该创建日期保存在mDiffNoteValue这个变量中,说明这两个值不相同 + } + mCreatedDate = createDate;//将该创建日期覆盖原创建日期 + + int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note//对附件操作 + .getInt(NoteColumns.HAS_ATTACHMENT) : 0; + if (mIsCreate || mHasAttachment != hasAttachment) {//如果只是通过上下文对note进行数据库操作,或者该有无附件的布尔值与原有无附件的布尔值不相同 + mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment);//将该有无附件的布尔值保存在mDiffNoteValue这个变量中,说明这两个值不相同 + } + mHasAttachment = hasAttachment;//将该有无附件的布尔值覆盖原有无附件的布尔值 + + long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note//对最近修改日期操作 + .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis(); + if (mIsCreate || mModifiedDate != modifiedDate) {//如果只是通过上下文对note进行数据库操作,或者该修改日期与原修改日期不相同 + mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate);//将该修改日期保存在mDiffNoteValue这个变量中,说明这两个值不相同 + } + mModifiedDate = modifiedDate;//将该修改日期覆盖原修改日期 + + long parentId = note.has(NoteColumns.PARENT_ID) ? note//获取数据的父节点ID + .getLong(NoteColumns.PARENT_ID) : 0; + if (mIsCreate || mParentId != parentId) {//如果只是通过上下文对note进行数据库操作,或者该父节点ID与原父节点ID不相同 + mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId);//将该父节点ID保存在mDiffNoteValue这个变量中,说明这两个值不相同 + } + mParentId = parentId;//将该父节点ID覆盖原父节点ID + + String snippet = note.has(NoteColumns.SNIPPET) ? note//对摘要操作 + .getString(NoteColumns.SNIPPET) : ""; + if (mIsCreate || !mSnippet.equals(snippet)) {// 如果只是通过上下文对note进行数据库操作,或者该文本片段与原文本片段不相同 + mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);// 将该文本片段保存在mDiffNoteValue这个变量中,说明这两个值不相同 + } + mSnippet = snippet;//将该文本片段覆盖原文本片段 + + int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)//获取数据的文件类型 + : Notes.TYPE_NOTE; + if (mIsCreate || mType != type) {// 如果只是通过上下文对note进行数据库操作,或者该文件类型与原文件类型不相同 + mDiffNoteValues.put(NoteColumns.TYPE, type);//将该文件类型保存在mDiffNoteValue这个变量中,说明这两个值不相同 + } + mType = type;//将该文件类型覆盖原文件类型 + + int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID) + : AppWidgetManager.INVALID_APPWIDGET_ID;//获取数据的小部件ID + if (mIsCreate || mWidgetId != widgetId) { + mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId);//如果只是通过上下文对note进行数据库操作,或者该小部件ID与原小部件ID不相同 + } + mWidgetId = widgetId;//将该小部件ID覆盖原小部件ID + + int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note//获取数据的小部件种类 + .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE; + if (mIsCreate || mWidgetType != widgetType) {//获取数据的小部件种类 + mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType); + } + mWidgetType = widgetType;//将该小部件种类覆盖原小部件种类 + + long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note//对便签具体内容操作 + .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0; + if (mIsCreate || mOriginParent != originParent) {//如果只是通过上下文对note进行数据库操作,或者该原始父文件夹ID与原原始父文件夹ID不相同 + mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent); + } + mOriginParent = originParent;//将该原始父文件夹ID覆盖原原始父文件夹ID + + for (int i = 0; i < dataArray.length(); i++) {//遍历 dataArray,查找 id 为 dataId 的数据 + JSONObject data = dataArray.getJSONObject(i);//依次获取数据表中的数据ID + SqlData sqlData = null;//若SQL日期无则新建一个 + if (data.has(DataColumns.ID)) {//该数据ID对应的数据如果存在,将对应的数据存在数据库中 + long dataId = data.getLong(DataColumns.ID); + for (SqlData temp : mDataList) { + if (dataId == temp.getId()) { + sqlData = temp; + } + } + } + + if (sqlData == null) {// 如果数据库数据没有进行更新 + sqlData = new SqlData(mContext);//就根据上下文创建一个数据库数据,并添加到数据列表中 + mDataList.add(sqlData); + } + + sqlData.setContent(data);//最后为数据库数据进行设置 + } + } + } catch (JSONException e) {//出现JSONException时,日志显示错误,同时打印堆栈轨迹 + Log.e(TAG, e.toString());//获取异常类型和异常详细消息 + e.printStackTrace(); + return false; + } + return true; + } + + public JSONObject getContent() {//获取content机制提供的数据并加载到note中 + try { + JSONObject js = new JSONObject();//创建一个新的jsonobject js + + if (mIsCreate) {//采用的是第一种构造方式,自然实施初始化而已,显示错误:没创建数据库 + Log.e(TAG, "it seems that we haven't created this in database yet"); + return null; + } + + JSONObject note = new JSONObject();//新建变量note用于传输共享数据 + if (mType == Notes.TYPE_NOTE) {//如果对象的类型是note类型 + note.put(NoteColumns.ID, mId);//设置以下12个内部变量 + note.put(NoteColumns.ALERTED_DATE, mAlertDate); + note.put(NoteColumns.BG_COLOR_ID, mBgColorId); + note.put(NoteColumns.CREATED_DATE, mCreatedDate); + note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment); + note.put(NoteColumns.MODIFIED_DATE, mModifiedDate); + note.put(NoteColumns.PARENT_ID, mParentId); + note.put(NoteColumns.SNIPPET, mSnippet); + note.put(NoteColumns.TYPE, mType); + note.put(NoteColumns.WIDGET_ID, mWidgetId); + note.put(NoteColumns.WIDGET_TYPE, mWidgetType); + note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent); + js.put(GTaskStringUtils.META_HEAD_NOTE, note);//将这个便签存入元数据中 + + JSONArray dataArray = new JSONArray();//获取数据库数据,并存入数组中 + for (SqlData sqlData : mDataList) {//将note中的data全部存入JSONArray中 + JSONObject data = sqlData.getContent(); + if (data != null) { + dataArray.put(data);//再将这个JSONArray对应共享数据mata,按键值对存入共享 + } + } + js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);//将元数据存入数组中 + } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) { + note.put(NoteColumns.ID, mId);//将id,类型,以及摘要,存入jsonobject,然后对应META_HEAD_NOTE键,存入共享 + note.put(NoteColumns.TYPE, mType); + note.put(NoteColumns.SNIPPET, mSnippet); + js.put(GTaskStringUtils.META_HEAD_NOTE, note); + } + + return js; + } catch (JSONException e) {//捕获json类型异常,显示错误,打印堆栈痕迹 + Log.e(TAG, e.toString()); + e.printStackTrace(); + } + return null; + } + + public void setParentId(long id) {//给当前id设置父id + mParentId = id; + mDiffNoteValues.put(NoteColumns.PARENT_ID, id); + } + + public void setGtaskId(String gid) { + mDiffNoteValues.put(NoteColumns.GTASK_ID, gid); + }//给当前id设置Gtaskid + + public void setSyncId(long syncId) { + mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId); + }//给当前id设置同步id + + public void resetLocalModified() { + mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0); + }//初始化本地修改,即撤销所有当前修改 + + public long getId() { + return mId; + }//获得当前id + + public long getParentId() { + return mParentId; + }//获得当前id的父id + + public String getSnippet() { + return mSnippet; + }//获取小片段即用于显示的部分便签内容 + + public boolean isNoteType() { + return mType == Notes.TYPE_NOTE; + }//判断是否为便签类型 + + public void commit(boolean validateVersion) {//commit函数用于把当前造作所做的修改保存到数据库 + if (mIsCreate) {//如果是第一种构造方式 + if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {//id无效且存在该id,将其移除 + mDiffNoteValues.remove(NoteColumns.ID); + } + + Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);//内容解析器中插入该便签的uri + try { + mId = Long.valueOf(uri.getPathSegments().get(1));//强制转换path为id ,Long型 + } catch (NumberFormatException e) {//捕获异常,转换出错,显示错误“获取note的id出现错误” + Log.e(TAG, "Get note id error :" + e.toString()); + throw new ActionFailureException("create note failed"); + } + if (mId == 0) {//若ID为0,则抛出创建id失败 + throw new IllegalStateException("Create thread id failed"); + } + + if (mType == Notes.TYPE_NOTE) {//如果是便签类型,则使用sqldata中的commit函数进行保存 + for (SqlData sqlData : mDataList) { + sqlData.commit(mId, false, -1); + } + } + } else {//如果是其他构造方式 + if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) {//如果该便签ID是无效ID,报错:没有这个便签 + Log.e(TAG, "No such note"); + throw new IllegalStateException("Try to update note with invalid id"); + } + if (mDiffNoteValues.size() > 0) { + mVersion ++;//更新版本:版本升级一个等级 + int result = 0; + if (!validateVersion) {//如果是无效版本 + result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" + + NoteColumns.ID + "=?)", new String[] {//构造字符串 + String.valueOf(mId) + }); + } else {//如果是有效版本 + result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" + + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)", + new String[] {//构造字符串失败 + String.valueOf(mId), String.valueOf(mVersion) + });//更新不存在,可能用户在同步时更新了 note + } + if (result == 0) {//如果内容解析器没有更新,那么报错:没有更新,或许用户在同步时进行更新 + Log.w(TAG, "there is no update. maybe user updates note when syncing"); + } + } + + if (mType == Notes.TYPE_NOTE) {//如果是便签类型,引用sqldata的commit提交数据 + for (SqlData sqlData : mDataList) { + sqlData.commit(mId, validateVersion, mVersion); + } + } + } + + // refresh local info + loadFromCursor(mId);//更新本地信息 + if (mType == Notes.TYPE_NOTE)//如果是便签类型 + loadDataContent();//获取共享数据并加载到数据库 + + mDiffNoteValues.clear();//清空共享数据 + mIsCreate = false;//改变数据库构造模式 + } +} diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java new file mode 100644 index 0000000..632b37c --- /dev/null +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java @@ -0,0 +1,245 @@ +package net.micode.notes.model;//包的名字 +import android.content.ContentProviderOperation;//批量的更新、插入、删除数据 +import android.content.ContentProviderResult;// 操作的结果 +import android.content.ContentUris;//用于添加和获取Uri后面的ID +import android.content.ContentValues;//一种用来存储基本数据类型数据的存储机制 +import android.content.Context;//获取调用者的调用内容 +import android.content.OperationApplicationException;//操作数据容错 +import android.net.Uri;//Uri相关操作,标识唯一的资源 +import android.os.RemoteException;//远程容错 +import android.util.Log;//输出日志,比如说出错、警告等 + +import net.micode.notes.data.Notes;// 小米便签一些属性的操作 +import net.micode.notes.data.Notes.CallNote;//调用 +import net.micode.notes.data.Notes.DataColumns;// 小米便签数据处理操作(数据栏) +import net.micode.notes.data.Notes.NoteColumns;//小米便签数据处理操作(笔记栏) +import net.micode.notes.data.Notes.TextNote;//小米便签数据处理操作(文本操作) + +import java.util.ArrayList;//java.util.ArrayList 类提供了可调整大小的数组,并实现了List的接口 + + +public class Note {//定义note类,处理单个便签 + private ContentValues mNoteDiffValues;//声明一个ContentValues变量,用来存储note与上次修改后的改动 + private NoteData mNoteData;//申明一个NoteData变量,用来记录note的一些基本信息 + private static final String TAG = "Note";//设置软件标签为“Note” + /** + * Create a new note id for adding a new note to databases + */ + public static synchronized long getNewNoteId(Context context, long folderId) { + //在文件夹folder下新建一个便签并且返回新建便签的ID + // Create a new note in the database + ContentValues values = new ContentValues();//在数据库中新建一个便签文件 + long createdTime = System.currentTimeMillis();//设置系统当前时间为新便签创建时间 + values.put(NoteColumns.CREATED_DATE, createdTime);//将创建时间存入ContentValues + values.put(NoteColumns.MODIFIED_DATE, createdTime);//将修改时间存入ContentValues + values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);//设定类型为便签类型 + values.put(NoteColumns.LOCAL_MODIFIED, 1);//将修改之后的属性值置为1 + values.put(NoteColumns.PARENT_ID, folderId);//将当前文件ID置为其父节点ID + //将数据写入数据库表格 + Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);//把当前创立的便签放到数据库中保存 + + long noteId = 0;//设置便签ID初值为0 + try {//异常处理 + noteId = Long.valueOf(uri.getPathSegments().get(1));//将uri解析出的字符数组的1号元素取值,转换成long类型赋给noteId + } catch (NumberFormatException e) {//如果该字符串不包含可以解析的长整型,就抛出NumberFormatException错误 + Log.e(TAG, "Get note id error :" + e.toString());//警告“获取ID错误” + noteId = 0;//将便签的ID置为0 + } + if (noteId == -1) {//如果出现非法id报错 + throw new IllegalStateException("Wrong note id:" + noteId);//便签的id非法,抛出异常 + } + return noteId;//若没有异常,那么返回这个id + } + +public Note() {//构造Note,实例化note数据 + mNoteDiffValues = new ContentValues();//存储便签属性 + mNoteData = new NoteData();//存储便签内容 + } + + public void setNoteValue(String key, String value) {//设置数据库表格的标签属性数据 + mNoteDiffValues.put(key, value);//设置key值和对应的value值 + mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);//修改之后标志为1 + mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());//更新修改时间为当前系统时间 + } + + public void setTextData(String key, String value) { + mNoteData.setTextData(key, value);//获取文本数据的ID + }//设置数据库表格的标签文本内容的数据 + + public void setTextDataId(long id) { + mNoteData.setTextDataId(id);//获取文本数据的ID + }//设置文本数据的ID + + public long getTextDataId() { + return mNoteData.mTextDataId;//返回文本数据的ID号 + }//函数: 得到文本数据的ID + + public void setCallDataId(long id) { + mNoteData.setCallDataId(id);//设置电话号码的数据ID号 + }//设置电话号码数据的ID + + public void setCallData(String key, String value) { + mNoteData.setCallData(key, value);//设置key,value值 + }//得到电话号码数据的ID + + public boolean isLocalModified(){//判断是否本地修改 + return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();//相较上次存在修改size()>0 + } + + public boolean syncNote(Context context, long noteId) {//判断数据是否同步 + if (noteId <= 0) {//id异常检测 + throw new IllegalArgumentException("Wrong note id:" + noteId);//抛出异常,弹出对话框错误ID并显示错误ID号 + } + + if (!isLocalModified()) {//如果本地没有发现修改,直接返回1,指示已经同步到数据库中 + return true;//返回true + } + + /** + * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and + * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the + * note data info + */ + if (context.getContentResolver().update( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null, + null) == 0){//数据被修改后被同步到数据库,为了安全操作,现在更新后重新同步 + Log.e(TAG, "Update note error, should not happen");//更新失败 + // Do not return, fall through + } + mNoteDiffValues.clear();//初始化便签特征值 + + if (mNoteData.isLocalModified()//再次检测是否同步 + && (mNoteData.pushIntoContentResolver(context, noteId) == null)) {//如果向内容接收者推送上下文失败,则返回错误 + return false;//推送失败,返回false + } + + return true;//同步成功,返回true + } + + private class NoteData {//定义一个基本的便签内容的数据类,主要包含文本数据和电话号码数据 + private long mTextDataId;//文本数据id + + private ContentValues mTextDataValues;//文本数据内容 + + private long mCallDataId;//电话号码数据ID + + private ContentValues mCallDataValues;//记录电话号码的数据 + + private static final String TAG = "NoteData";//设置NoteData标签名称 + + public NoteData() {//NoteData的构造函数,初始化四个变量 + mTextDataValues = new ContentValues();//初始化一个文本数据,为了储存文本 + mCallDataValues = new ContentValues();//初始化一个电话号码数据,为了储存电话号码 + mTextDataId = 0;//初始化文本数据ID,置为0 + mCallDataId = 0;//初始化电话号码ID,置为0 + } + + boolean isLocalModified() {// 如果本地修改,即文本数据或者呼叫数据修改,则返回1 + return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;//文本或电话数据中至少一个有修改 + } + + void setTextDataId(long id) {// 定义一个名为setTextDataId的方法,接受一个long类型的参数id + if(id <= 0) {// // 判断id是否小于等于0 + throw new IllegalArgumentException("Text data id should larger than 0"); + // 如果id小于等于0,则抛出IllegalArgumentException异常,提示文本数据id应该大于0 + } + mTextDataId = id;// 如果id大于0,则将其赋值给成员变 + } + void setCallDataId(long id) {//设置呼叫数据,实际上就是把传入的数据放入呼叫数据库中 + if (id <= 0){// 判断ID是否合法 + // id不能小于0,如果小于0,则抛出异常 + throw new IllegalArgumentException("Call data id should larger than 0"); + //如果id小于等于0,则抛出IllegalArgumentException异常,提示文本数据id应该大于0 + } + mCallDataId = id;//如果id大于0,则将其赋值给成员变量 + } + + void setCallData(String key, String value) {//设置文本数据,方法同设置呼叫数据一样,将传入参数放入文本数据库中 + mCallDataValues.put(key, value);//写入参数key,value + mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); + //将LOCAL_MODIFIED设置为1,表示本地修改过 + mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); + //将当前时间戳存入MODIFIED_DATE中,表示最后修改时间 + } + + void setTextData(String key, String value) {//设置数据库中的文本数据 + mTextDataValues.put(key, value);//写入参数key,value + mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);//将标志值设为1 + mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); + // 设置修改时间为当前系统时间 + } + + Uri pushIntoContentResolver(Context context, long noteId) {//下面函数的作用是将新的数据通过Uri的操作存储到数据库 + /** + * Check for safety + */ + if (noteId <= 0) {//保证便器的编号为正数 + throw new IllegalArgumentException("Wrong note id:" + noteId); + //ID号出错时抛出异常 + } + + ArrayList operationList = new ArrayList();//数据库操作链表 + ContentProviderOperation.Builder builder = null;//数据库的操作列表 + + if(mTextDataValues.size() > 0) {//把文本数据存入DataColumns + mTextDataValues.put(DataColumns.NOTE_ID, noteId);//将数据的id传入文本数据库 + if (mTextDataId == 0) {//文本数据ID为零,意味着这个id是新建默认的id + mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);//MIME:MIME(MultipurposeInternet Mail Extensions)多用途互联网邮件扩展类型。是设定某种扩展名的文件用一种应用程序来打开的方式类型,当该扩展名文件被访问的时候,浏览器会自动使用指定应用程序来打开。多用于指定一些客户端自定义的文件名,以及一些媒体文件打开方式。 + Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,//uri内容接收器插入文本数据库,放在Notes.CONTENT_DATA_URI的路径下 + mTextDataValues); + try {// 尝试重新给它设置id + setTextDataId(Long.valueOf(uri.getPathSegments().get(1)));//从Uri中获取id,并将其转换为Long类型,然后调用setTextDataId()方法设置mTextDataId的值 + } catch (NumberFormatException e) {//异常日志 + Log.e(TAG, "Insert new text data fail with noteId" + noteId);//转换失败,则记录日志,清空mTextDataValues + mTextDataValues.clear();//将电话数据加入DataColums的数据结构中,并加入数据库 + return null;//返回NULL + } + } else {//文本数据ID不为0 + builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( + Notes.CONTENT_DATA_URI, mTextDataId));//内容提供者的更新操作,因为这个uri对应的数据是已经存在的,所以不需要向上面一样新建,而是更新即可 + builder.withValues(mTextDataValues);// 语句: 将uri和id合并后,更新 + operationList.add(builder.build());//操作队列添加上内容提供者 + } + mTextDataValues.clear();//设定电话号码的属性数据 + } + + if(mCallDataValues.size() > 0) {//对于电话号码的数据也是和文本数据一样的同步处理 + mCallDataValues.put(DataColumns.NOTE_ID, noteId);//写入noteID + if (mCallDataId == 0) {//将电话号码的id设定为uri提供的id + mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE);//将MIME_TYPE设置为CallNote.CONTENT_ITEM_TYPE + Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, + mCallDataValues);//通过context.getContentResolver().insert()方法将mCallDataValues插入到Notes.CONTENT_DATA_URI对应的表格中,并获取返回的Uri + try {//异常处理,返回1 + setCallDataId(Long.valueOf(uri.getPathSegments().get(1)));//从Uri中获取id,并将其转换为Long类型,然后调用setCallDataId()方法设置mCallDataId的值 + } catch (NumberFormatException e) {//转换失败 + Log.e(TAG, "Insert new call data fail with noteId" + noteId);//出错日志:插入新的电话号码数据时出错 + mCallDataValues.clear();//清空 + return null;//返回NULL + } + } else {// 如果mCallDataId不为0,则执行以下操作 + builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( + Notes.CONTENT_DATA_URI, mCallDataId));//内容提供者的更新操作,这个uri对应的数据是已经存在的,因此进行更新即可 + builder.withValues(mCallDataValues);//可以插入、更新、删除 + operationList.add(builder.build());//存储过程中的异常处理 + } + mCallDataValues.clear();//清空 + }//将电话号码数据存入DataColumns + + if (operationList.size() > 0) {//如果操作列表不为空,即需要进行操作 + try {//如果这个便签之前有历史操作的话,那么在此基础上返回上一个操作对应位置的uri + ContentProviderResult[] results = context.getContentResolver().applyBatch( + Notes.AUTHORITY, operationList);//Android源码中对通讯录的操作,应用端使用ContentProvider提供的applyBatch,进行批量处理通讯录的联系人入库 + return (results == null || results.length == 0 || results[0] == null) ? null + : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId); + } catch (RemoteException e) { + Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));//如果发生RemoteException异常,记录日志并返回null + return null;//返回NULL + } catch (OperationApplicationException e) {//异常日志 + Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));//如果发生OperationApplicationException异常,记录日志并返回null + return null;//返回NULL + } + }//存储过程中异常处理 + return null; + } + } +} diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java new file mode 100644 index 0000000..36a77f8 --- /dev/null +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -0,0 +1,355 @@ +package net.micode.notes.model;//表明包的位置为model + +import android.appwidget.AppWidgetManager;//导入 AppWidgetManager 类,用于管理小部件 +import android.content.ContentUris;// 导入 ContentUris 类,用于处理 Uri +import android.content.Context;//该导入 Context 类,用于获取应用程序环境信息 +import android.database.Cursor;//导入 Cursor 类,用于查询数据库 +import android.text.TextUtils;//导入 TextUtils 类,用于处理文本 +import android.util.Log;//导入 Log 类,用于输出日志信息 + +import net.micode.notes.data.Notes;//导入 Notes 类,用于操作便笺数据 +import net.micode.notes.data.Notes.CallNote;//加导入 CallNote 类,用于操作通话记录便笺 +import net.micode.notes.data.Notes.DataColumns;// 导入 DataColumns 类,用于操作便笺数据的列 +import net.micode.notes.data.Notes.DataConstants;//导入 DataConstants 类,用于定义常量 +import net.micode.notes.data.Notes.NoteColumns;//导入 NoteColumns 类,用于操作便笺数据的列 +import net.micode.notes.data.Notes.TextNote;//导入 TextNote 类,用于操作文本便笺 +import net.micode.notes.tool.ResourceParser.NoteBgResources;//导入 NoteBgResources 类,用于解析便笺背景资源 + + +public class WorkingNote {//申明WorkingNote类,创建小米便签的主要类,包括创建空便签,保存便签,加载小米便签内容,和设置小米便签的一些小部件之类的操作 + // Note for the working note + private Note mNote;//声明一个Note类型的变量 + // Note Id + private long mNoteId;//声明便签content + // Note content + private String mContent;//声明便签mode + // Note mode + private int mMode;//是否是清单模式 + private long mAlertDate;//设置闹钟时间 + + private long mModifiedDate;// 最后修改时间 + + private int mBgColorId;//背景颜色ID + + private int mWidgetId;//控件ID + + private int mWidgetType;//控件类型,有Notes.TYPE_WIDGET_INVALIDE(-1)、TYPE_WIDGET_2X(0)、TYPE_WIDGET_4X(1)三种 + + private long mFolderId;//文件夹所对应的ID + + private Context mContext;//当前便签的上下文 + + private static final String TAG = "WorkingNote";//声明WorkingNote标签 + + private boolean mIsDeleted;//是否被删除 + + private NoteSettingChangedListener mNoteSettingStatusListener;//监听便签值是否改变 + + public static final String[] DATA_PROJECTION = new String[] {//声明 NOTE_PROJECTION字符串数组 + DataColumns.ID,//数据ID + DataColumns.CONTENT,//内容 + DataColumns.MIME_TYPE,//MIME类型 + DataColumns.DATA1,//自定义数据1 + DataColumns.DATA2,//自定义数据2 + DataColumns.DATA3,//自定义数据3 + DataColumns.DATA4,//自定义数据4 + }; + + public static final String[] NOTE_PROJECTION = new String[] {//申明一个保存便签属性的string数组 + NoteColumns.PARENT_ID,//父级ID + NoteColumns.ALERTED_DATE,//提醒日期 + NoteColumns.BG_COLOR_ID,//背景颜色ID + NoteColumns.WIDGET_ID,//小部件ID + NoteColumns.WIDGET_TYPE,//小部件类型 + NoteColumns.MODIFIED_DATE//修改日期 + }; + + private static final int DATA_ID_COLUMN = 0;//定义数据表的列常量 + + private static final int DATA_CONTENT_COLUMN = 1;//数据ID列 + + private static final int DATA_MIME_TYPE_COLUMN = 2;//数据MIME类型列 + + private static final int DATA_MODE_COLUMN = 3;//数据模式列 + + private static final int NOTE_PARENT_ID_COLUMN = 0;//便签父级ID列 + + private static final int NOTE_ALERTED_DATE_COLUMN = 1;//便签提醒日期列 + + private static final int NOTE_BG_COLOR_ID_COLUMN = 2;//便签颜色ID列 + + private static final int NOTE_WIDGET_ID_COLUMN = 3;//便签小部件ID列 + + private static final int NOTE_WIDGET_TYPE_COLUMN = 4;//便签小部件类型列 + + private static final int NOTE_MODIFIED_DATE_COLUMN = 5;//便签修改日期列 + + // New note construct + private WorkingNote(Context context, long folderId) {//缺省noteID的构造函数,直接使用内容和文件号新建便签 + mContext = context;//WorkingNote的构造函数 + mAlertDate = 0;//默认提醒日期为0 + mModifiedDate = System.currentTimeMillis();//系统现在的时间,时间的表达格式为当前计算机时间和GMT时间(格林威治时间)1970年1月1号0时0分0秒所差的毫秒数 + mFolderId = folderId;//默认最后一次修改日期为当前时间 + mNote = new Note();//加载一个已存在的便签 + mNoteId = 0;//笔记ID,默认0 + mIsDeleted = false;//没有提供id所以默认为0 + mMode = 0;//模式,默认0 + mWidgetType = Notes.TYPE_WIDGET_INVALIDE;//默认是不可见 + } + + // Existing note construct + private WorkingNote(Context context, long noteId, long folderId) {//从Cursor中导入Note的属性值,包括文件夹id、背景颜色id、窗口图标的id和类型、提醒时间以及改动时间 + mContext = context;//上下文对象 + mNoteId = noteId;//笔记ID + mFolderId = folderId;//文件夹ID + mIsDeleted = false;//是否已删除,默认false + mNote = new Note();//创建一个新的Note对象 + loadNote();//加载笔记内容 + } + + private void loadNote() {//函数:加载已有的便签 + Cursor cursor = mContext.getContentResolver().query( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null, + null, null);//查找当前便签属性对应的便签的位置 + //若存在,存储相应信息 + if (cursor != null) {//如果查询结果不为空,则将查询到的信息存储到相应的变量中 + if (cursor.moveToFirst()) {//moveToFirst:will return false if the cursor is empty + mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);//存储各项信息 + mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN);//关闭cursor游标 + mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN); + mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN); + mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN); + mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN); + } + cursor.close();//若不存在,报错 + // 如果查询结果为空,则输出错误日志并抛出异常 + } else {// 否则说明不存在这个便签,加载错误 + Log.e(TAG, "No note with id:" + mNoteId);//未能找到此note,返回异常 + throw new IllegalArgumentException("Unable to find note with id " + mNoteId);//抛出异常,找不到NoteID + }//调用loadNoteData方法加载笔记数据 + loadNoteData();//调用方法loadNoteData,导入便签的内容 + } + + private void loadNoteData() {//载入便签数据 + Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,//调用query函数查找到便签ID为mNoteId的位置,并将光标移动到该位置 + DataColumns.NOTE_ID + "=?", new String[] { + String.valueOf(mNoteId) + }, null);//判断信息是否为空 + + if (cursor != null) {//光标存在时,将光标移动到便签的起始位置 + if (cursor.moveToFirst()) {//do while循环将便签数据全部读取出来 + do { + String type = cursor.getString(DATA_MIME_TYPE_COLUMN);//获取存储内容的类型 + if (DataConstants.NOTE.equals(type)) {//数据类型为文本类型时,存为文本 + mContent = cursor.getString(DATA_CONTENT_COLUMN);//如果是便签文本类型,那么加载到相应的里面保存 + mMode = cursor.getInt(DATA_MODE_COLUMN); + mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN)); + } else if (DataConstants.CALL_NOTE.equals(type)) {//如果是电话号码类的信息则储存电话号码 + mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN)); + } else {//如果类型错误,则提示异常 + Log.d(TAG, "Wrong note type with type:" + type);//再否则就是有错误 + } + } while (cursor.moveToNext());//查阅所有项,直到为空 + } + cursor.close();//查找失败时,在日志中记录错误信息为无法找到id号为mNoteId的便签 + } else {//否则记录异常日志,没有ID为mNoteId的数据 + Log.e(TAG, "No data with id:" + mNoteId);//否则记录异常日志,没有ID为mNoteId的数据 + throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);//抛出异常 + } + } + + //创建空的Note + //传参 + public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,//创建空的Note,传参:context,文件夹id,widget,背景颜色 + int widgetType, int defaultBgColorId) { + WorkingNote note = new WorkingNote(context, folderId);//根据环境和id创建一个空的便签 + note.setBgColorId(defaultBgColorId);//设定相关属性 + note.setWidgetId(widgetId);//设定widget id + note.setWidgetType(widgetType);//设置窗口类型 + return note; + } + + public static WorkingNote load(Context context, long id) {//导入一个新的正在写入的便签(WorkingNote) + return new WorkingNote(context, id, 0);//返回便签 + } + + public synchronized boolean saveNote() {//保存Note + if (isWorthSaving()) {//是否值得保存 + if (!existInDatabase()) {//是否存在数据库 + if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) {//没有成功创建一个便签时,返回出错日志 + Log.e(TAG, "Create new note fail with id:" + mNoteId); + return false; + } + } + + mNote.syncNote(mContext, mNoteId);//同步便签内容及便签id + + /** + * Update widget content if there exist any widget of this note + */ + if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID + && mWidgetType != Notes.TYPE_WIDGET_INVALIDE + && mNoteSettingStatusListener != null) {//判断是否存在widget可以上传 + mNoteSettingStatusListener.onWidgetChanged(); + } + return true; + } else { + return false; + } + } + + public boolean existInDatabase(){//是否在数据库中存在 + return mNoteId > 0;//判断是否在数据库中存储过,直接判定id大小即可 + } + + private boolean isWorthSaving() {//判断是否有保存的必要性 + if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent)) + || (existInDatabase() && !mNote.isLocalModified())) {//已被删除或者不在数据库中但是是空便签或者已经在数据库中但本地没有修改过,都不保存 + return false; + } else { + return true;//其余情况,要保存,返回true + } + } + + public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {//设置监听“设置状态改变” + mNoteSettingStatusListener = l; + } + + public void setAlertDate(long date, boolean set) {//设置AlertDate;若 mAlertDate与data不同,则更改mAlertDate并设定NoteValue + if (date != mAlertDate) {//发现date与mAlertDate不一致时,设置mAlertDate为date + mAlertDate = date;//为设置的日期打标签 + mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate)); + } + if (mNoteSettingStatusListener != null) {//判断是否为空 + mNoteSettingStatusListener.onClockAlertChanged(date, set); + } + } + + public void markDeleted(boolean mark) {//设定删除标记 + mIsDeleted = mark;//设定标记 + if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID + && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) { + //调用mNoteSettingStatusListener的 onWidgetChanged方法 + mNoteSettingStatusListener.onWidgetChanged(); + } + } + + public void setBgColorId(int id) {//设置背景颜色为第id号颜色 + if (id != mBgColorId) {// 判断并更新背景颜色 + mBgColorId = id;//设置背景颜色 + if (mNoteSettingStatusListener != null) { + mNoteSettingStatusListener.onBackgroundColorChanged(); + } + mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id)); + } + } + + public void setCheckListMode(int mode) {//设定检查列表模式 + if (mMode != mode) {//当mMode和mode不相同时进行设定 + if (mNoteSettingStatusListener != null) {//设定之后更改mMode + mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode); + } + mMode = mode;//把当前便签蛇者为清单模式的便签 + mNote.setTextData(TextNote.MODE, String.valueOf(mMode));//重设文本数据,改变MODE项 + } + } + + public void setWidgetType(int type) {//设置窗口类型 + if (type != mWidgetType) {//判断传入的类型是否与当前类型一样,否则更改为传入的类型并储存便签的窗口数据 + mWidgetType = type;//调用Note的setNoteValue方法更改WidgetType + mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType)); + } + } + + public void setWidgetId(int id) { + if (id != mWidgetId) { + mWidgetId = id; + mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId)); + } + } + + public void setWorkingText(String text) { + if (!TextUtils.equals(mContent, text)) { + mContent = text; + mNote.setTextData(DataColumns.CONTENT, mContent); + } + } + + public void convertToCallNote(String phoneNumber, long callDate) { + mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate)); + mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber); + mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER)); + } + + public boolean hasClockAlert() { + return (mAlertDate > 0 ? true : false); + } + + public String getContent() { + return mContent; + } + + public long getAlertDate() { + return mAlertDate; + } + + public long getModifiedDate() { + return mModifiedDate; + } + + public int getBgColorResId() { + return NoteBgResources.getNoteBgResource(mBgColorId); + } + + public int getBgColorId() { + return mBgColorId; + } + + public int getTitleBgResId() { + return NoteBgResources.getNoteTitleBgResource(mBgColorId); + } + + public int getCheckListMode() { + return mMode; + } + + public long getNoteId() { + return mNoteId; + } + + public long getFolderId() { + return mFolderId; + } + + public int getWidgetId() { + return mWidgetId; + } + + public int getWidgetType() { + return mWidgetType; + } + + public interface NoteSettingChangedListener { + /** + * Called when the background color of current note has just changed + */ + void onBackgroundColorChanged(); + + /** + * Called when user set clock + */ + void onClockAlertChanged(long date, boolean set); + + /** + * Call when user create note from widget + */ + void onWidgetChanged(); + + /** + * Call when switch between check list mode and normal mode + * @param oldMode is previous mode before change + * @param newMode is new mode + */ + void onCheckListModeChanged(int oldMode, int newMode); + } +} diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 66% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java index 85723be..80232c2 100644 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java @@ -41,34 +41,44 @@ import java.io.IOException; public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener { - private long mNoteId; - private String mSnippet; + private long mNoteId; //1 文本在数据库存储中的ID号 + private String mSnippet; //2 闹钟提示时出现的文本片段 private static final int SNIPPET_PREW_MAX_LEN = 60; MediaPlayer mPlayer; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + //3 Bundle类型的数据与Map类型的数据相似,都是以key-value的形式存储数据的 + //4 onsaveInstanceState方法是用来保存Activity的状态的 + //5 能从onCreate的参数savedInsanceState中获得状态数据 requestWindowFeature(Window.FEATURE_NO_TITLE); + //6 界面显示——无标题 final Window win = getWindow(); win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); if (!isScreenOn()) { win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON + //7 保持窗体点亮 | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON + //8 将窗体点亮 | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON + //9 允许窗体点亮时锁屏 | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR); - } + } //10 在手机锁屏后如果到了闹钟提示时间,点亮屏幕 Intent intent = getIntent(); try { mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId); + //11 根据ID从数据库中获取标签的内容; + //12 getContentResolver()是实现数据共享,实例存储。 mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0, SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info) : mSnippet; + //13 判断标签片段是否达到符合长度 } catch (IllegalArgumentException e) { e.printStackTrace(); return; @@ -77,20 +87,25 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD mPlayer = new MediaPlayer(); if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) { showActionDialog(); + //14 弹出对话框 playAlarmSound(); + //15 闹钟提示音激发 } else { finish(); + //16 完成闹钟动作 } } private boolean isScreenOn() { + //17 判断屏幕是否锁屏,调用系统函数判断,最后返回值是布尔类型 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); return pm.isScreenOn(); } private void playAlarmSound() { + //18 闹钟提示音激发 Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); - + //19 调用系统的铃声管理URI,得到闹钟提示音 int silentModeStreams = Settings.System.getInt(getContentResolver(), Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); @@ -101,12 +116,19 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD } try { mPlayer.setDataSource(this, url); + //20 方法:setDataSource(Context context, Uri uri) + //21 解释:无返回值,设置多媒体数据来源【根据 Uri】 mPlayer.prepare(); + //22 准备同步 mPlayer.setLooping(true); + //23 设置是否循环播放 mPlayer.start(); + //24 开始播放 } catch (IllegalArgumentException e) { // TODO Auto-generated catch block e.printStackTrace(); + //24 e.printStackTrace()函数功能是抛出异常, 还将显示出更深的调用信息 + //25 System.out.println(e),这个方法打印出异常,并且输出在哪里出现的异常 } catch (SecurityException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -121,37 +143,52 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD private void showActionDialog() { AlertDialog.Builder dialog = new AlertDialog.Builder(this); - dialog.setTitle(R.string.app_name); - dialog.setMessage(mSnippet); - dialog.setPositiveButton(R.string.notealert_ok, this); + /*26 AlertDialog的构造方法全部是Protected的,所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。 + 要创建一个AlertDialog,就要用到AlertDialog.Builder中的create()方法,如这里的dialog就是新建了一个AlertDialog*/ + + dialog.setTitle(R.string.app_name); //27 为对话框设置标题 + dialog.setMessage(mSnippet); //28 为对话框设置内容 + dialog.setPositiveButton(R.string.notealert_ok, this); //29 给对话框添加"Yes"按钮 if (isScreenOn()) { - dialog.setNegativeButton(R.string.notealert_enter, this); + dialog.setNegativeButton(R.string.notealert_enter, this); //30 对话框添加"No"按钮 } dialog.show().setOnDismissListener(this); } public void onClick(DialogInterface dialog, int which) { switch (which) { + //31 用which来选择click后下一步的操作 case DialogInterface.BUTTON_NEGATIVE: + //32 这是取消操作 Intent intent = new Intent(this, NoteEditActivity.class); + //33 实现两个类间的数据传输 intent.setAction(Intent.ACTION_VIEW); + //34 设置动作属性 intent.putExtra(Intent.EXTRA_UID, mNoteId); + //35 实现key-value对EXTRA_UID为key;mNoteId为键 + startActivity(intent); + //36 开始动作 break; default: + //这是确定操作 break; } } public void onDismiss(DialogInterface dialog) { stopAlarmSound(); + //37 停止闹钟声音 finish(); + //完成该动作 } private void stopAlarmSound() { if (mPlayer != null) { mPlayer.stop(); + //38 停止播放 mPlayer.release(); + //39 释放MediaPlayer对象 mPlayer = null; } } diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 80% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java index f221202..b2f2fd1 100644 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java @@ -1,4 +1,4 @@ -/* +/*二、警报项接收器 * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,19 +34,21 @@ public class AlarmInitReceiver extends BroadcastReceiver { NoteColumns.ID, NoteColumns.ALERTED_DATE }; - + //40 对数据库的操作,调用标签ID和闹钟时间 private static final int COLUMN_ID = 0; private static final int COLUMN_ALERTED_DATE = 1; @Override public void onReceive(Context context, Intent intent) { long currentDate = System.currentTimeMillis(); + //41 System.currentTimeMillis()产生一个当前的毫秒 + //这个毫秒其实就是自1970年1月1日0时起的毫秒数 Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI, PROJECTION, NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE, new String[] { String.valueOf(currentDate) }, null); - + //42 Cursor在这里的作用是通过查找数据库中的标签内容,找到和当前系统时间相等的标签 if (c != null) { if (c.moveToFirst()) { do { @@ -61,5 +63,10 @@ public class AlarmInitReceiver extends BroadcastReceiver { } c.close(); } + //43 + //然而通过网上查找资料发现,对于闹钟机制的启动,通常需要上面的几个步骤 + //如新建Intent、PendingIntent以及AlarmManager等 + //这里就是根据数据库里的闹钟时间创建一个闹钟机制 + } } diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 75% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java index 54e503b..2db0785 100644 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java @@ -1,4 +1,4 @@ -/* +/*三、警报接收器 * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,7 +24,13 @@ public class AlarmReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { intent.setClass(context, AlarmAlertActivity.class); + //44 启动AlarmAlertActivity intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + //45 + //activity要存在于activity的栈中,而非activity的途径启动activity时必然不存在一个activity的栈 + //所以要新起一个栈装入启动的activity context.startActivity(intent); } } + +//46 这是实现alarm这个功能最接近用户层的包,基于上面的两个包, diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 86% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java index 496b0cd..41b5690 100644 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java @@ -1,4 +1,4 @@ -/* +/*四、日期时间选择器 * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,6 +29,7 @@ import android.widget.FrameLayout; import android.widget.NumberPicker; public class DateTimePicker extends FrameLayout { + //47 FrameLayout是布局模板之一 private static final boolean DEFAULT_ENABLE_STATE = true; @@ -50,8 +51,10 @@ public class DateTimePicker extends FrameLayout { private final NumberPicker mHourSpinner; private final NumberPicker mMinuteSpinner; private final NumberPicker mAmPmSpinner; + //48 NumberPicker是数字选择器 + //这里定义的四个变量全部是在设置闹钟时需要选择的变量(如日期、时、分、上午或者下午) private Calendar mDate; - + //49 定义了Calendar类型的变量mDate,用于操作时间 private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; private boolean mIsAm; @@ -71,41 +74,49 @@ public class DateTimePicker extends FrameLayout { updateDateControl(); onDateTimeChanged(); } - }; + };//50 OnValueChangeListener,这是时间改变监听器,这里主要是对日期的监听 + //将现在日期的值传递给mDate;updateDateControl是同步操作 private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() { + //这里是对 小时(Hour) 的监听 @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { boolean isDateChanged = false; Calendar cal = Calendar.getInstance(); + //51 声明一个Calendar的变量cal,便于后续的操作 if (!mIs24HourView) { if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); isDateChanged = true; + //52 这里是对于12小时制时,晚上11点和12点交替时对日期的更改 } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -1); isDateChanged = true; } + //53 这里是对于12小时制时,凌晨11点和12点交替时对日期的更改 if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY || oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { mIsAm = !mIsAm; updateAmPmControl(); - } + }//54 这里是对于12小时制时,中午11点和12点交替时对AM和PM的更改 } else { if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); isDateChanged = true; + //55 这里是对于24小时制时,晚上11点和12点交替时对日期的更改 } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -1); isDateChanged = true; } - } + } //56 这里是对于12小时制时,凌晨11点和12点交替时对日期的更改 int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY); + //57 通过数字选择器对newHour的赋值 mDate.set(Calendar.HOUR_OF_DAY, newHour); + //58 通过set函数将新的Hour值传给mDate onDateTimeChanged(); if (isDateChanged) { setCurrentYear(cal.get(Calendar.YEAR)); @@ -117,15 +128,20 @@ public class DateTimePicker extends FrameLayout { private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() { @Override + //59 这里是对 分钟(Minute)改变的监听 public void onValueChange(NumberPicker picker, int oldVal, int newVal) { int minValue = mMinuteSpinner.getMinValue(); int maxValue = mMinuteSpinner.getMaxValue(); int offset = 0; + //60 设置offset,作为小时改变的一个记录数据 if (oldVal == maxValue && newVal == minValue) { offset += 1; } else if (oldVal == minValue && newVal == maxValue) { offset -= 1; } + //61 + //如果原值为59,新值为0,则offset加1 + //如果原值为0,新值为59,则offset减1 if (offset != 0) { mDate.add(Calendar.HOUR_OF_DAY, offset); mHourSpinner.setValue(getCurrentHour()); @@ -145,6 +161,7 @@ public class DateTimePicker extends FrameLayout { }; private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() { + //62 对AM和PM的监听 @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { mIsAm = !mIsAm; @@ -166,18 +183,22 @@ public class DateTimePicker extends FrameLayout { public DateTimePicker(Context context) { this(context, System.currentTimeMillis()); } - + //63 通过对数据库的访问,获取当前的系统时间 public DateTimePicker(Context context, long date) { this(context, date, DateFormat.is24HourFormat(context)); - } + }//64 上面函数的得到的是一个天文数字(1970至今的秒数),需要DateFormat将其变得有意义 public DateTimePicker(Context context, long date, boolean is24HourView) { super(context); + //65 获取系统时间 mDate = Calendar.getInstance(); mInitialising = true; mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY; inflate(context, R.layout.datetime_picker, this); - + //66 + //如果当前Activity里用到别的layout,比如对话框layout + //还要设置这个layout上的其他组件的内容,就必须用inflate()方法先将对话框的layout找出来 + //然后再用findViewById()找到它上面的其它组件 mDateSpinner = (NumberPicker) findViewById(R.id.date); mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL); mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL); @@ -227,6 +248,7 @@ public class DateTimePicker extends FrameLayout { mIsEnabled = enabled; } + //67 下面的各函数主要是对上面代码引用到的各函数功能的实现 @Override public boolean isEnabled() { return mIsEnabled; @@ -240,7 +262,7 @@ public class DateTimePicker extends FrameLayout { public long getCurrentDateInTimeMillis() { return mDate.getTimeInMillis(); } - + //68 实现函数——得到当前的秒数 /** * Set the current date * @@ -252,7 +274,7 @@ public class DateTimePicker extends FrameLayout { setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)); } - + //69 实现函数功能——设置当前的时间,参数是date /** * Set the current date * @@ -269,13 +291,14 @@ public class DateTimePicker extends FrameLayout { setCurrentDay(dayOfMonth); setCurrentHour(hourOfDay); setCurrentMinute(minute); - } + }//70 实现函数功能——设置当前的时间,参数是各详细的变量 /** * Get current year * * @return The current year */ + //71 下面是得到year、month、day等值 public int getCurrentYear() { return mDate.get(Calendar.YEAR); } @@ -446,7 +469,7 @@ public class DateTimePicker extends FrameLayout { mDateSpinner.setDisplayedValues(mDateDisplayValues); mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2); mDateSpinner.invalidate(); - } + } //72 对于星期几的算法 private void updateAmPmControl() { if (mIs24HourView) { @@ -455,7 +478,7 @@ public class DateTimePicker extends FrameLayout { int index = mIsAm ? Calendar.AM : Calendar.PM; mAmPmSpinner.setValue(index); mAmPmSpinner.setVisibility(View.VISIBLE); - } + } //73 对于上下午操作的算法 } private void updateHourControl() { @@ -465,7 +488,8 @@ public class DateTimePicker extends FrameLayout { } else { mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW); mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW); - } + } // 对于小时的算法 + } /** diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 75% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java index 2c47ba4..6364cad 100644 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java @@ -1,4 +1,4 @@ -/* +/*五、日期时间选择对话框 * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,18 +32,25 @@ import android.text.format.DateUtils; public class DateTimePickerDialog extends AlertDialog implements OnClickListener { private Calendar mDate = Calendar.getInstance(); + //74 创建一个Calendar类型的变量 mDate,方便时间的操作 private boolean mIs24HourView; private OnDateTimeSetListener mOnDateTimeSetListener; + //75 声明一个时间日期滚动选择控件 mOnDateTimeSetListener private DateTimePicker mDateTimePicker; + //76 + //DateTimePicker控件,控件一般用于让用户可以从日期列表中选择单个值。 + //运行时,单击控件边上的下拉箭头,会显示为两个部分:一个下拉列表,一个用于选择日期的 + public interface OnDateTimeSetListener { void OnDateTimeSet(AlertDialog dialog, long date); - } + } //77 对该界面对话框的实例化 + public DateTimePickerDialog(Context context, long date) { - super(context); + super(context); //78 对数据库的操作 mDateTimePicker = new DateTimePicker(context); - setView(mDateTimePicker); + setView(mDateTimePicker); //79 添加一个子视图 mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() { public void onDateTimeChanged(DateTimePicker view, int year, int month, int dayOfMonth, int hourOfDay, int minute) { @@ -52,22 +59,27 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth); mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); mDate.set(Calendar.MINUTE, minute); + //80 将视图中的各选项设置为系统当前时间 updateTitle(mDate.getTimeInMillis()); } }); mDate.setTimeInMillis(date); + //81 得到系统时间 mDate.set(Calendar.SECOND, 0); + //82 将秒数设置为0 mDateTimePicker.setCurrentDate(mDate.getTimeInMillis()); setButton(context.getString(R.string.datetime_dialog_ok), this); setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null); + //83 设置按钮 set24HourView(DateFormat.is24HourFormat(this.getContext())); + //84 时间标准化打印 updateTitle(mDate.getTimeInMillis()); } public void set24HourView(boolean is24HourView) { mIs24HourView = is24HourView; } - + //85 将时间日期滚动选择控件实例化 public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) { mOnDateTimeSetListener = callBack; } @@ -79,12 +91,13 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener DateUtils.FORMAT_SHOW_TIME; flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); - } + }//86 android开发中常见日期管理工具类(API)——DateUtils:按照上下午显示时间 public void onClick(DialogInterface arg0, int arg1) { if (mOnDateTimeSetListener != null) { mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis()); } - } + }//87 第一个参数arg0是接收到点击事件的对话框 + //88 第二个参数arg1是该对话框上的按钮 } \ No newline at end of file diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 82% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java index 613dc74..bcd5dd5 100644 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java @@ -1,4 +1,4 @@ -/* +/*六、下拉菜单 * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,15 +29,18 @@ import net.micode.notes.R; public class DropdownMenu { private Button mButton; - private PopupMenu mPopupMenu; + private PopupMenu mPopupMenu; //89 声明一个下拉菜单 private Menu mMenu; public DropdownMenu(Context context, Button button, int menuId) { mButton = button; mButton.setBackgroundResource(R.drawable.dropdown_icon); + //90 设置这个view的背景 mPopupMenu = new PopupMenu(context, mButton); mMenu = mPopupMenu.getMenu(); mPopupMenu.getMenuInflater().inflate(menuId, mMenu); + //91 MenuInflater是用来实例化Menu目录下的Menu布局文件 + //92 根据ID来确认menu的内容选项 mButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { mPopupMenu.show(); @@ -48,14 +51,14 @@ public class DropdownMenu { public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) { if (mPopupMenu != null) { mPopupMenu.setOnMenuItemClickListener(listener); - } + }//93 设置菜单的监听 } public MenuItem findItem(int id) { return mMenu.findItem(id); } - + //94 对于菜单选项的初始化,根据索引搜索菜单需要的选项 public void setTitle(CharSequence title) { mButton.setText(title); } -} +} //95 布局文件,设置标题 diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 79% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java index 96b77da..02db915 100644 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java @@ -1,4 +1,4 @@ -/* +/*七、文件夹列表适配器 * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -30,16 +30,23 @@ import net.micode.notes.data.Notes.NoteColumns; public class FoldersListAdapter extends CursorAdapter { + //96 CursorAdapter是Cursor和ListView的接口 + //97 FoldersListAdapter继承了CursorAdapter的类 + //98 主要作用是便签数据库和用户的交互 + //99 这里就是用folder(文件夹)的形式展现给用户 public static final String [] PROJECTION = { NoteColumns.ID, NoteColumns.SNIPPET - }; + };//100 调用数据库中便签的ID和片段 + public static final int ID_COLUMN = 0; public static final int NAME_COLUMN = 1; public FoldersListAdapter(Context context, Cursor c) { super(context, c); + //101数据库操作 + //102创建一个文件夹,对于各文件夹中子标签的初始化 // TODO Auto-generated constructor stub } @@ -55,20 +62,21 @@ public class FoldersListAdapter extends CursorAdapter { .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); ((FolderListItem) view).bind(folderName); } - } + } //103将各个布局文件绑定起来 public String getFolderName(Context context, int position) { Cursor cursor = (Cursor) getItem(position); return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); - } + }//104根据数据库中标签的ID得到标签的各项内容 private class FolderListItem extends LinearLayout { private TextView mName; public FolderListItem(Context context) { - super(context); + super(context); //105操作数据库 inflate(context, R.layout.folder_list_item, this); + //106根据布局文件的名字等信息将其找出来 mName = (TextView) findViewById(R.id.tv_folder_name); } diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 72% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 0e8e838..70c173c 100644 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -1,4 +1,4 @@ -/* +/*八、便签编辑活动 * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -74,6 +74,8 @@ import java.util.regex.Pattern; public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { + //107该类主要是针对标签的编辑 + //108继承了系统内部许多和监听有关的类 private class HeadViewHolder { public TextView tvModified; @@ -83,7 +85,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, public ImageView ibSetBgColor; } - + //109使用Map实现数据存储 private static final Map sBgSelectorBtnsMap = new HashMap(); static { sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); @@ -91,7 +93,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE); sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN); sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); - } + } //110put函数是将指定值和指定键相连 private static final Map sBgSelectorSelectionMap = new HashMap(); static { @@ -100,7 +102,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select); sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select); sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); - } + } //111put函数是将指定值和指定键相连 + private static final Map sFontSizeBtnsMap = new HashMap(); static { @@ -108,7 +111,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL); sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM); sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER); - } + } //112put函数是将指定值和指定键相连 private static final Map sFontSelectorSelectionMap = new HashMap(); static { @@ -116,27 +119,31 @@ public class NoteEditActivity extends Activity implements OnClickListener, sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select); sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select); sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select); - } + }//113put函数是将指定值和指定键相连 - private static final String TAG = "NoteEditActivity"; + private static final String TAG = "NoteEditActivity"; + //114私有化一个界面操作mHeadViewPanel,对表头的操作 private HeadViewHolder mNoteHeaderHolder; - + //115私有化一个界面操作mNoteBgColorSelector,对背景颜色的操作 private View mHeadViewPanel; - + //116私有化一个界面操作mFontSizeSelector,对标签字体的操作 private View mNoteBgColorSelector; - + //117声明编辑控件,对文本操作 private View mFontSizeSelector; - + //118私有化一个界面操作mNoteEditorPanel,文本编辑的控制板 + //private WorkingNote mWorkingNote; private EditText mNoteEditor; private View mNoteEditorPanel; private WorkingNote mWorkingNote; - + //119对模板WorkingNote的初始化 private SharedPreferences mSharedPrefs; + //120私有化SharedPreferences的数据存储方式 + //121它的本质是基于XML文件存储key-value键值对数据 private int mFontSizeId; - + //122用于操作字体的大小 private static final String PREFERENCE_FONT_SIZE = "pref_font_size"; private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10; @@ -145,7 +152,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); private LinearLayout mEditTextList; - + //123线性布局 private String mUserQuery; private Pattern mPattern; @@ -153,7 +160,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); this.setContentView(R.layout.note_edit); - + //124对数据库的访问操作 if (savedInstanceState == null && !initActivityState(getIntent())) { finish(); return; @@ -176,7 +183,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, return; } Log.d(TAG, "Restoring from killed activity"); - } + }//125为防止内存不足时程序的终止,在这里有一个保存现场的函数 } private boolean initActivityState(Intent intent) { @@ -188,34 +195,42 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) { long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0); mUserQuery = ""; - + //126如果用户实例化标签时,系统并未给出标签ID /** * Starting from the searched result */ + //127根据键值查找ID if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) { noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY)); mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY); } - + //128如果ID在数据库中未找到 if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) { Intent jump = new Intent(this, NotesListActivity.class); startActivity(jump); + //129程序将跳转到上面声明的intent——jump showToast(R.string.error_note_not_exist); finish(); return false; + //130ID在数据库中找到 } else { mWorkingNote = WorkingNote.load(this, noteId); if (mWorkingNote == null) { Log.e(TAG, "load note failed with note id" + noteId); + //131打印出红色的错误信息 finish(); return false; } } + //132setSoftInputMode——软键盘输入模式 getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { // New note + // intent.getAction() + // 133大多用于broadcast发送广播时给机制(intent)设置一个action,就是一个字符串 + // 134用户可以通过receive(接受)intent,通过 getAction得到的字符串,来决定做什么 long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0); int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); @@ -223,7 +238,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, Notes.TYPE_WIDGET_INVALIDE); int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, ResourceParser.getDefaultBgId(this)); - + // 135intent.getInt(Long、String)Extra是对各变量的语法分析 // Parse call-record note String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER); long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0); @@ -240,9 +255,10 @@ public class NoteEditActivity extends Activity implements OnClickListener, finish(); return false; } + //136将电话号码与手机的号码簿相关 } else { mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, - widgetType, bgResId); + widgetType, bgResId); //137创建一个新的WorkingNote mWorkingNote.convertToCallNote(phoneNumber, callDate); } } else { @@ -269,8 +285,10 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private void initNoteScreen() { + //138对界面的初始化操作 mNoteEditor.setTextAppearance(this, TextAppearanceResources .getTexAppearanceResource(mFontSizeId)); + //139设置外观 if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { switchToListMode(mWorkingNote.getContent()); } else { @@ -294,13 +312,15 @@ public class NoteEditActivity extends Activity implements OnClickListener, */ showAlertHeader(); } - + //140设置闹钟的显示 private void showAlertHeader() { if (mWorkingNote.hasClockAlert()) { long time = System.currentTimeMillis(); if (time > mWorkingNote.getAlertDate()) { mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired); - } else { + } + //141如果系统时间大于了闹钟设置的时间,那么闹钟失效 + else { mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString( mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS)); } @@ -309,6 +329,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } else { mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE); + //142显示闹钟开启的图标 }; } @@ -329,28 +350,31 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (!mWorkingNote.existInDatabase()) { saveNote(); } + //143在创建一个新的标签时,先在数据库中匹配 + //144如果不存在,那么先在数据库中存储 outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId()); Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState"); } @Override + //145MotionEvent是对屏幕触控的传递机制 public boolean dispatchTouchEvent(MotionEvent ev) { if (mNoteBgColorSelector.getVisibility() == View.VISIBLE && !inRangeOfView(mNoteBgColorSelector, ev)) { mNoteBgColorSelector.setVisibility(View.GONE); return true; - } + }//146颜色选择器在屏幕上可见 if (mFontSizeSelector.getVisibility() == View.VISIBLE && !inRangeOfView(mFontSizeSelector, ev)) { mFontSizeSelector.setVisibility(View.GONE); return true; - } + }//147字体大小选择器在屏幕上可见 return super.dispatchTouchEvent(ev); } - + //148对屏幕触控的坐标进行操作 private boolean inRangeOfView(View view, MotionEvent ev) { - int []location = new int[2]; + int[] location = new int[2]; view.getLocationOnScreen(location); int x = location[0]; int y = location[1]; @@ -358,8 +382,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, || ev.getX() > (x + view.getWidth()) || ev.getY() < y || ev.getY() > (y + view.getHeight())) { - return false; - } + //149如果触控的位置超出了给定的范围,返回false + return false; + } return true; } @@ -377,13 +402,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, for (int id : sBgSelectorBtnsMap.keySet()) { ImageView iv = (ImageView) findViewById(id); iv.setOnClickListener(this); - } + }//150对标签各项属性内容的初始化 mFontSizeSelector = findViewById(R.id.font_size_selector); for (int id : sFontSizeBtnsMap.keySet()) { View view = findViewById(id); view.setOnClickListener(this); - }; + };//151对字体大小的选择 mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE); /** @@ -405,7 +430,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } clearSettingState(); } - + //152和桌面小工具的同步 private void updateWidget() { Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) { @@ -430,7 +455,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (id == R.id.btn_set_bg_color) { mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - - View.VISIBLE); + View.VISIBLE); } else if (sBgSelectorBtnsMap.containsKey(id)) { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); @@ -480,7 +505,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); } - @Override + @Override//153对选择菜单的准备 public boolean onPrepareOptionsMenu(Menu menu) { if (isFinishing()) { return true; @@ -489,6 +514,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, menu.clear(); if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) { getMenuInflater().inflate(R.menu.call_note_edit, menu); + //154 MenuInflater是用来实例化Menu目录下的Menu布局文件的 } else { getMenuInflater().inflate(R.menu.note_edit, menu); } @@ -506,146 +532,212 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == R.id.menu_new_note) { - createNewNote(); - }else if(item.getItemId() == R.id.menu_delete) { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_note)); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - deleteCurrentNote(); - finish(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - }else if(item.getItemId() == R.id.menu_font_size) { - mFontSizeSelector.setVisibility(View.VISIBLE); - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - }else if(item.getItemId() == R.id.menu_list_mode) { - mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? - TextNote.MODE_CHECK_LIST : 0); - }else if(item.getItemId() == R.id.menu_share) { - getWorkingText(); - sendTo(this, mWorkingNote.getContent()); - }else if(item.getItemId() == R.id.menu_send_to_desktop) { - sendToDesktop(); - }else if(item.getItemId() == R.id.menu_alert) { - setReminder(); - }else if(item.getItemId() == R.id.menu_delete_remind) { - mWorkingNote.setAlertDate(0, false); - }else{ + //155函数功能:动态改变菜单选项内容 + //函数实现:如下注释 + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + //156根据菜单的id来编剧相关项目 + case R.id.menu_new_note: + //157创建一个新的便签 + createNewNote(); + break; + case R.id.menu_delete: + //158删除便签 + AlertDialog.Builder builder = new AlertDialog.Builder(this); + //159创建关于删除操作的对话框 + builder.setTitle(getString(R.string.alert_title_delete)); + //160设置标签的标题为alert_title_delete + builder.setIcon(android.R.drawable.ic_dialog_alert); + //161设置对话框图标 + builder.setMessage(getString(R.string.alert_message_delete_note)); + //162设置对话框内容 + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + //163建立按键监听器 + public void onClick(DialogInterface dialog, int which) { + //164点击所触发事件 + deleteCurrentNote(); + //165 删除单签便签 + finish(); + } + }); + //166添加“YES”按钮 + builder.setNegativeButton(android.R.string.cancel, null); + //167添加“NO”的按钮 + builder.show(); + //168显示对话框 + break; + case R.id.menu_font_size: + //169字体大小的编辑 + mFontSizeSelector.setVisibility(View.VISIBLE); + //170 将字体选择器置为可见 + findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); + //171 通过id找到相应的大小 + break; + case R.id.menu_list_mode: + //172选择列表模式 + mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? + TextNote.MODE_CHECK_LIST : 0); + break; + case R.id.menu_share: + //173菜单共享 + getWorkingText(); + sendTo(this, mWorkingNote.getContent()); + //174 用sendto函数将运行文本发送到遍历的本文内 + break; + case R.id.menu_send_to_desktop: + //175发送到桌面 + sendToDesktop(); + break; + case R.id.menu_alert: + //176创建提醒器 + setReminder(); + break; + case R.id.menu_delete_remind://177删除日期提醒 + mWorkingNote.setAlertDate(0, false); + break; + default: + break; } return true; } + //178函数功能:建立事件提醒器 + //函数实现:如下注释 private void setReminder() { DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); + // 179建立修改时间日期的对话框 d.setOnDateTimeSetListener(new OnDateTimeSetListener() { public void OnDateTimeSet(AlertDialog dialog, long date) { - mWorkingNote.setAlertDate(date , true); + mWorkingNote.setAlertDate(date , true);//选择提醒的日期 } - }); - d.show(); + });//180建立时间日期的监听器 + d.show(); //显示对话框 } /** * Share note to apps that support {@link Intent#ACTION_SEND} action * and {@text/plain} type */ + + //181函数功能:共享便签 + //函数实现:如下注释 private void sendTo(Context context, String info) { - Intent intent = new Intent(Intent.ACTION_SEND); - intent.putExtra(Intent.EXTRA_TEXT, info); - intent.setType("text/plain"); - context.startActivity(intent); + Intent intent = new Intent(Intent.ACTION_SEND);//182建立intent链接选项 + intent.putExtra(Intent.EXTRA_TEXT, info); //183将需要传递的便签信息放入text文件中 + intent.setType("text/plain"); //184编辑连接器的类型 + context.startActivity(intent); //185在acti中进行链接 + } + //186函数功能:创建一个新的便签 + //函数实现:如下注释 private void createNewNote() { // Firstly, save current editing notes + //187保存当前便签 saveNote(); // For safety, start a new NoteEditActivity finish(); Intent intent = new Intent(this, NoteEditActivity.class); + //188设置链接器 intent.setAction(Intent.ACTION_INSERT_OR_EDIT); + //189该活动定义为创建或编辑 intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId()); + //190将运行便签的id添加到INTENT_EXTRA_FOLDER_ID标记中 startActivity(intent); + //191开始activity并链接 } + //192函数功能:删除当前便签 + //函数实现:如下注释 private void deleteCurrentNote() { + //193假如当前运行的便签内存有数据 if (mWorkingNote.existInDatabase()) { HashSet ids = new HashSet(); long id = mWorkingNote.getNoteId(); if (id != Notes.ID_ROOT_FOLDER) { ids.add(id); + //194如果不是头文件夹建立一个hash表把便签id存起来 } else { Log.d(TAG, "Wrong note id, should not happen"); - } + } //195否则报错 if (!isSyncMode()) { + //196在非同步模式情况下 + //197删除操作 if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { Log.e(TAG, "Delete Note error"); } } else { + //198同步模式 + //199移动至垃圾文件夹的操作 if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) { Log.e(TAG, "Move notes to trash folder error, should not happens"); } } } - mWorkingNote.markDeleted(true); - } + mWorkingNote.markDeleted(true); //200将这些标签的删除标记置为true + } + //201函数功能:判断是否为同步模式 + //202 函数实现:直接看NotesPreferenceActivity中同步名称是否为空 private boolean isSyncMode() { return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; } + //203 函数功能:设置提醒时间 + //204 函数实现:如下注释 public void onClockAlertChanged(long date, boolean set) { /** * User could set clock to an unsaved note, so before setting the * alert clock, we should save the note first */ - if (!mWorkingNote.existInDatabase()) { + if (!mWorkingNote.existInDatabase()) { //205首先保存已有的便签 saveNote(); } if (mWorkingNote.getNoteId() > 0) { Intent intent = new Intent(this, AlarmReceiver.class); intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId())); + //206若有有运行的便签就是建立一个链接器将标签id都存在uri中 PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE)); + //207设置提醒管理器 showAlertHeader(); if(!set) { alarmManager.cancel(pendingIntent); } else { alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); } + //208如果用户设置了时间,就通过提醒管理器设置一个监听事项 } else { /** * There is the condition that user has input nothing (the note is * not worthy saving), we have no note id, remind the user that he * should input something */ + //209没有运行的便签就报错 Log.e(TAG, "Clock alert setting error"); showToast(R.string.error_note_empty_for_clock); } } + //210 函数功能:Widget发生改变的所触发的事件 public void onWidgetChanged() { updateWidget(); - } + }//211 更新Widget + //212 函数功能: 删除编辑文本框所触发的事件 public void onEditTextDelete(int index, String text) { int childCount = mEditTextList.getChildCount(); if (childCount == 1) { return; } - + //213没有编辑框的话直接返回 for (int i = index + 1; i < childCount; i++) { ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) .setIndex(i - 1); + //214 通过id把编辑框存在便签编辑框中 } mEditTextList.removeViewAt(index); @@ -657,12 +749,14 @@ public class NoteEditActivity extends Activity implements OnClickListener, edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById( R.id.et_edit_text); } + //215 通过id把编辑框存在空的NoteEditText中 int length = edit.length(); edit.append(text); - edit.requestFocus(); - edit.setSelection(length); + edit.requestFocus();//216请求优先完成该此 编辑 + edit.setSelection(length);//217定位到length位置处的条目 } + //218函数功能:进入编辑文本框所触发的事件 public void onEditTextEnter(int index, String text) { /** * Should not happen, check for debug @@ -673,53 +767,64 @@ public class NoteEditActivity extends Activity implements OnClickListener, View view = getListItem(text, index); mEditTextList.addView(view, index); + //219建立一个新的视图并添加到编辑文本框内 NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - edit.requestFocus(); - edit.setSelection(0); + edit.requestFocus();//220请求优先操作 + edit.setSelection(0);//221定位到起始位置 for (int i = index + 1; i < mEditTextList.getChildCount(); i++) { ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) .setIndex(i); + //222遍历子文本框并设置对应对下标 } } + //223函数功能:切换至列表模式 private void switchToListMode(String text) { mEditTextList.removeAllViews(); String[] items = text.split("\n"); - int index = 0; + int index = 0;//224清空所有视图,初始化下标 for (String item : items) { if(!TextUtils.isEmpty(item)) { mEditTextList.addView(getListItem(item, index)); index++; + //225遍历所有文本单元并添加到文本框中 } } mEditTextList.addView(getListItem("", index)); mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus(); + //226优先请求此操作 + + mNoteEditor.setVisibility(View.GONE); //227便签编辑器不可见 + mEditTextList.setVisibility(View.VISIBLE);//228将文本编辑框置为可见 - mNoteEditor.setVisibility(View.GONE); - mEditTextList.setVisibility(View.VISIBLE); } + //229函数功能:获取高亮效果的反馈情况 private Spannable getHighlightQueryResult(String fullText, String userQuery) { SpannableString spannable = new SpannableString(fullText == null ? "" : fullText); + //230新建一个效果选项 if (!TextUtils.isEmpty(userQuery)) { - mPattern = Pattern.compile(userQuery); - Matcher m = mPattern.matcher(fullText); + mPattern = Pattern.compile(userQuery); //231将用户的询问进行解析 + Matcher m = mPattern.matcher(fullText);//232建立一个状态机检查Pattern并进行匹配 int start = 0; while (m.find(start)) { spannable.setSpan( new BackgroundColorSpan(this.getResources().getColor( R.color.user_query_highlight)), m.start(), m.end(), - Spannable.SPAN_INCLUSIVE_EXCLUSIVE); - start = m.end(); + Spannable.SPAN_INCLUSIVE_EXCLUSIVE); //233设置背景颜色 + start = m.end();//234跟新起始位置 } } return spannable; } + //235 函数功能:获取列表项 private View getListItem(String item, int index) { View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null); + //236 创建一个视图 final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); + //237 创建一个文本编辑框并设置可见性 CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item)); cb.setOnCheckedChangeListener(new OnCheckedChangeListener() { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -729,13 +834,14 @@ public class NoteEditActivity extends Activity implements OnClickListener, edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); } } - }); + }); //238 建立一个打钩框并设置监听器 - if (item.startsWith(TAG_CHECKED)) { + if (item.startsWith(TAG_CHECKED)) {//239 选择勾选 cb.setChecked(true); edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); item = item.substring(TAG_CHECKED.length(), item.length()).trim(); } else if (item.startsWith(TAG_UNCHECKED)) { + //240 选择不勾选 cb.setChecked(false); edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); item = item.substring(TAG_UNCHECKED.length(), item.length()).trim(); @@ -744,61 +850,77 @@ public class NoteEditActivity extends Activity implements OnClickListener, edit.setOnTextViewChangeListener(this); edit.setIndex(index); edit.setText(getHighlightQueryResult(item, mUserQuery)); + //241运行编辑框的监听器对该行为作出反应,并设置下标及文本内容 return view; } + //242函数功能:便签内容发生改变所 触发的事件 public void onTextChange(int index, boolean hasText) { if (index >= mEditTextList.getChildCount()) { Log.e(TAG, "Wrong index, should not happen"); - return; + return;//243越界报错 } if(hasText) { mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE); } else { mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE); } + //244如果内容不为空则将其子编辑框可见性置为可见,否则不可见 } + //245函数功能:检查模式和列表模式的切换 public void onCheckListModeChanged(int oldMode, int newMode) { if (newMode == TextNote.MODE_CHECK_LIST) { - switchToListMode(mNoteEditor.getText().toString()); + switchToListMode(mNoteEditor.getText().toString()); //246检查模式切换到列表模式 } else { if (!getWorkingText()) { mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", "")); - } + } //247若是获取到文本就改变其检查标记 mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); mEditTextList.setVisibility(View.GONE); mNoteEditor.setVisibility(View.VISIBLE); + //248修改文本编辑器的内容和可见性 } } + //249函数功能:设置勾选选项表并返回是否勾选的标记 private boolean getWorkingText() { - boolean hasChecked = false; + boolean hasChecked = false; //250初始化check标记 if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { + //251 若模式为CHECK_LIST StringBuilder sb = new StringBuilder(); + //252创建可变字符串 for (int i = 0; i < mEditTextList.getChildCount(); i++) { View view = mEditTextList.getChildAt(i); + //253遍历所有子编辑框的视图 NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); if (!TextUtils.isEmpty(edit.getText())) { + //254若文本不为空 if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) { + //255该选项框已打钩 sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n"); hasChecked = true; + //256扩展字符串为已打钩并把标记置true } else { sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n"); + //257扩展字符串添加未打钩 } } } - mWorkingNote.setWorkingText(sb.toString()); + mWorkingNote.setWorkingText(sb.toString());//258利用编辑好的字符串设置运行便签的内容 } else { mWorkingNote.setWorkingText(mNoteEditor.getText().toString()); + //259 若不是该模式直接用编辑器中的内容设置运行中标签的内容 } return hasChecked; } + //260函数功能:保存便签 private boolean saveNote() { getWorkingText(); boolean saved = mWorkingNote.saveNote(); + //261运行 getWorkingText()之后保存 if (saved) { /** * There are two modes from List view to edit view, open one note, @@ -807,11 +929,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, * new node requires to the top of the list. This code * {@link #RESULT_OK} is used to identify the create/edit state */ + //262如英文注释所说链接RESULT_OK是为了识别保存的2种情况,一是创建后保存,二是修改后保存 setResult(RESULT_OK); } return saved; } + //263函数功能:将便签发送至桌面 private void sendToDesktop() { /** * Before send message to home, we should make sure that current @@ -820,12 +944,15 @@ public class NoteEditActivity extends Activity implements OnClickListener, */ if (!mWorkingNote.existInDatabase()) { saveNote(); + //264若不存在数据也就是新的标签就保存起来先 } if (mWorkingNote.getNoteId() > 0) { Intent sender = new Intent(); Intent shortcutIntent = new Intent(this, NoteEditActivity.class); + //265建立发送到桌面的连接器 shortcutIntent.setAction(Intent.ACTION_VIEW); + //266链接为一个视图 shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); sender.putExtra(Intent.EXTRA_SHORTCUT_NAME, @@ -833,9 +960,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app)); sender.putExtra("duplicate", true); + //267将便签的相关信息都添加到要发送的文件里 sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); + //268设置sneder的行为是发送 showToast(R.string.info_note_enter_desktop); sendBroadcast(sender); + //269显示到桌面 } else { /** * There is the condition that user has input nothing (the note is @@ -844,20 +974,23 @@ public class NoteEditActivity extends Activity implements OnClickListener, */ Log.e(TAG, "Send to desktop error"); showToast(R.string.error_note_empty_for_send_to_desktop); + //270空便签直接报错 } } - +//271函数功能:编辑小图标的标题 private String makeShortcutIconTitle(String content) { content = content.replace(TAG_CHECKED, ""); content = content.replace(TAG_UNCHECKED, ""); return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0, - SHORTCUT_ICON_TITLE_MAX_LEN) : content; + SHORTCUT_ICON_TITLE_MAX_LEN) : content;//直接设置为content中的内容并返回,有勾选和未勾选2种 } - +//272 函数功能:显示提示的视图 +//273 函数实现:根据下标显示对应的提示 private void showToast(int resId) { showToast(resId, Toast.LENGTH_SHORT); } - +//274 函数功能:持续显示提示的视图 +//275 函数实现:根据下标和持续的时间(duration)编辑提示视图并显示 private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 63% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java index 2afe2a8..16fa891 100644 --- a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java @@ -1,4 +1,4 @@ -/* +/*九、便签编辑文本 * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -37,6 +37,7 @@ import net.micode.notes.R; import java.util.HashMap; import java.util.Map; +//276继承edittext,设置便签设置文本框 public class NoteEditText extends EditText { private static final String TAG = "NoteEditText"; private int mIndex; @@ -46,6 +47,7 @@ public class NoteEditText extends EditText { private static final String SCHEME_HTTP = "http:" ; private static final String SCHEME_EMAIL = "mailto:" ; + //277建立一个字符和整数的hash表,用于链接电话,网站,还有邮箱 private static final Map sSchemaActionResMap = new HashMap(); static { sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel); @@ -56,17 +58,20 @@ public class NoteEditText extends EditText { /** * Call by the {@link NoteEditActivity} to delete or add edit text */ + //278在NoteEditActivity中删除或添加文本的操作,可以看做是一个文本是否被变的标记,英文注释已说明的很清楚 public interface OnTextViewChangeListener { /** * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens * and the text is null */ + //279处理删除按键时的操作 void onEditTextDelete(int index, String text); /** * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER} * happen */ + //280处理进入按键时的操作 void onEditTextEnter(int index, String text); /** @@ -77,15 +82,18 @@ public class NoteEditText extends EditText { private OnTextViewChangeListener mOnTextViewChangeListener; + //281根据context设置文本 public NoteEditText(Context context) { super(context, null); mIndex = 0; } + //282设置当前光标 public void setIndex(int index) { mIndex = index; } + //283初始化文本修改标记 public void setOnTextViewChangeListener(OnTextViewChangeListener listener) { mOnTextViewChangeListener = listener; } @@ -93,17 +101,22 @@ public class NoteEditText extends EditText { public NoteEditText(Context context, AttributeSet attrs) { super(context, attrs, android.R.attr.editTextStyle); } - + //284AttributeSet 自定义空控件属性,用于维护便签动态变化的属性 + //285初始化便签 public NoteEditText(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); // TODO Auto-generated constructor stub } + //286view里的函数,处理手机屏幕的所有事件 + /*287参数event为手机屏幕触摸事件封装类的对象,其中封装了该事件的所有信息, + 例如触摸的位置、触摸的类型以及触摸的时间等。该对象会在用户触摸手机屏幕时被创建。*/ @Override public boolean onTouchEvent(MotionEvent event) { switch (event.getAction()) { + //288重写了需要处理屏幕被按下的事件 case MotionEvent.ACTION_DOWN: - + //289跟新当前坐标值 int x = (int) event.getX(); int y = (int) event.getY(); x -= getTotalPaddingLeft(); @@ -111,9 +124,11 @@ public class NoteEditText extends EditText { x += getScrollX(); y += getScrollY(); + //290用布局控件layout根据x,y的新值设置新的位置 Layout layout = getLayout(); int line = layout.getLineForVertical(y); int off = layout.getOffsetForHorizontal(line, x); + //291更新光标新的位置 Selection.setSelection(getText(), off); break; } @@ -122,44 +137,55 @@ public class NoteEditText extends EditText { } @Override + //292函数功能:处理用户按下一个键盘按键时会触发 的事件 public boolean onKeyDown(int keyCode, KeyEvent event) { - switch (keyCode) { - case KeyEvent.KEYCODE_ENTER: + switch (keyCode) {//293根据按键的 Unicode 编码值来处理 + case KeyEvent.KEYCODE_ENTER://“进入”按键 if (mOnTextViewChangeListener != null) { return false; } break; - case KeyEvent.KEYCODE_DEL: + case KeyEvent.KEYCODE_DEL://294“删除”按键 mSelectionStartBeforeDelete = getSelectionStart(); break; default: break; - } + } //295继续执行父类的其他点击事件 return super.onKeyDown(keyCode, event); } - @Override + @Override//296函数功能:处理用户松开一个键盘按键时会触发的事件 public boolean onKeyUp(int keyCode, KeyEvent event) { - switch(keyCode) { + switch(keyCode) { //297根据按键的 Unicode 编码值来处理,有删除和进入2种操作 case KeyEvent.KEYCODE_DEL: - if (mOnTextViewChangeListener != null) { + if (mOnTextViewChangeListener != null) {//若是被修改过 if (0 == mSelectionStartBeforeDelete && mIndex != 0) { + //298若之前有被修改并且文档不为空 mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString()); + //299利用上文OnTextViewChangeListener对KEYCODE_DEL按键情况的删除函数进行删除 return true; } } else { Log.d(TAG, "OnTextViewChangeListener was not seted"); + //300其他情况报错,文档的改动监听器并没有建立 } break; case KeyEvent.KEYCODE_ENTER: + //301同上也是分为监听器是否建立2种情况 if (mOnTextViewChangeListener != null) { int selectionStart = getSelectionStart(); + //302获取当前位置 String text = getText().subSequence(selectionStart, length()).toString(); + //303获取当前文本 setText(getText().subSequence(0, selectionStart)); + //304根据获取的文本设置当前文本 mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text); + //305当{@link KeyEvent#KEYCODE_ENTER}添加新文本 } else { Log.d(TAG, "OnTextViewChangeListener was not seted"); + //306其他情况报错,文档的改动监听器并没有建立 } + //307继续执行父类的其他按键弹起的事件 break; default: break; @@ -168,50 +194,73 @@ public class NoteEditText extends EditText { } @Override + /*308 + * 函数功能:当焦点发生变化时,会自动调用该方法来处理焦点改变的事件 + * 实现方式:如下注释 + * 参数:focused表示触发该事件的View是否获得了焦点,当该控件获得焦点时,Focused等于true,否则等于false。 + direction表示焦点移动的方向,用数值表示 + Rect:表示在触发事件的View的坐标系中,前一个获得焦点的矩形区域,即表示焦点是从哪里来的。如果不可用则为null + */ protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) { - if (mOnTextViewChangeListener != null) { - if (!focused && TextUtils.isEmpty(getText())) { + if (mOnTextViewChangeListener != null) {//309若监听器已经建立 + if (!focused && TextUtils.isEmpty(getText())) {//310获取到焦点并且文本不为空 mOnTextViewChangeListener.onTextChange(mIndex, false); + //311mOnTextViewChangeListener子函数,置false隐藏事件选项 } else { mOnTextViewChangeListener.onTextChange(mIndex, true); + //312mOnTextViewChangeListener子函数,置true显示事件选项 } } + //313继续执行父类的其他焦点变化的事件 super.onFocusChanged(focused, direction, previouslyFocusedRect); } @Override + //314函数功能:生成上下文菜单 protected void onCreateContextMenu(ContextMenu menu) { if (getText() instanceof Spanned) { + //315有文本存在 int selStart = getSelectionStart(); int selEnd = getSelectionEnd(); + //316获取文本开始和结尾位置 int min = Math.min(selStart, selEnd); int max = Math.max(selStart, selEnd); + //317获取开始到结尾的最大值和最小值 final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class); + //318设置url的信息的范围值 if (urls.length == 1) { int defaultResId = 0; for(String schema: sSchemaActionResMap.keySet()) { + //319获取计划表中所有的key值 if(urls[0].getURL().indexOf(schema) >= 0) { + //320若url可以添加则在添加后将defaultResId置为key所映射的值 defaultResId = sSchemaActionResMap.get(schema); break; } } if (defaultResId == 0) { + //321defaultResId == 0则说明url并没有添加任何东西,所以置为连接其他SchemaActionResMap的值 defaultResId = R.string.note_link_other; } + //322建立菜单 menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener( new OnMenuItemClickListener() { + //323新建按键监听器 public boolean onMenuItemClick(MenuItem item) { // goto a new intent urls[0].onClick(NoteEditText.this); + //324根据相应的文本设置菜单的按键 + return true; } }); } } + //325继续执行父类的其他菜单创建的事件 super.onCreateContextMenu(menu); } } diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/scr/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from scr/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/scr/Notes-master1/app/src/main/res/color/primary_text_dark.xml b/src/Notes-master1/app/src/main/res/color/primary_text_dark.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/color/primary_text_dark.xml rename to src/Notes-master1/app/src/main/res/color/primary_text_dark.xml diff --git a/scr/Notes-master1/app/src/main/res/color/secondary_text_dark.xml b/src/Notes-master1/app/src/main/res/color/secondary_text_dark.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/color/secondary_text_dark.xml rename to src/Notes-master1/app/src/main/res/color/secondary_text_dark.xml diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/bg_btn_set_color.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/call_record.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/call_record.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/call_record.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/clock.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/clock.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/clock.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/delete.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/delete.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/delete.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/dropdown_icon.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_blue.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_green.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/edit_green.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_red.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/edit_red.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_blue.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_green.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_red.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_white.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_white.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/edit_white.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/edit_yellow.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/font_large.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/font_large.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/font_large.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/font_normal.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/font_normal.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/font_normal.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/font_small.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/font_small.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/font_small.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/font_super.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/font_super.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/font_super.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/icon_app.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/icon_app.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/icon_app.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_background.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_background.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_background.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_background.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_down.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_middle.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_single.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_up.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_folder.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_folder.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_footer_bg.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_green_down.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_green_middle.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_green_single.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_green_up.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_red_down.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_red_middle.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_red_single.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_red_up.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_white_down.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_white_middle.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_white_single.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_white_up.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_down.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_single.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_up.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/menu_delete.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/menu_delete.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/menu_delete.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/menu_move.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/menu_move.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/menu_move.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/new_note_normal.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/new_note_normal.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/new_note_pressed.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/notification.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/notification.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/notification.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/search_result.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/search_result.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/search_result.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/selected.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/selected.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/selected.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/title_alert.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/title_alert.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/title_alert.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/title_bar_bg.9.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_blue.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_green.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_red.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_white.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_yellow.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_blue.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_green.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_red.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_white.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_yellow.png rename to src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/scr/Notes-master1/app/src/main/res/drawable/new_note.xml b/src/Notes-master1/app/src/main/res/drawable/new_note.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/drawable/new_note.xml rename to src/Notes-master1/app/src/main/res/drawable/new_note.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/account_dialog_title.xml b/src/Notes-master1/app/src/main/res/layout/account_dialog_title.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/account_dialog_title.xml rename to src/Notes-master1/app/src/main/res/layout/account_dialog_title.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/add_account_text.xml b/src/Notes-master1/app/src/main/res/layout/add_account_text.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/add_account_text.xml rename to src/Notes-master1/app/src/main/res/layout/add_account_text.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/datetime_picker.xml b/src/Notes-master1/app/src/main/res/layout/datetime_picker.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/datetime_picker.xml rename to src/Notes-master1/app/src/main/res/layout/datetime_picker.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/dialog_edit_text.xml b/src/Notes-master1/app/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/dialog_edit_text.xml rename to src/Notes-master1/app/src/main/res/layout/dialog_edit_text.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/folder_list_item.xml b/src/Notes-master1/app/src/main/res/layout/folder_list_item.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/folder_list_item.xml rename to src/Notes-master1/app/src/main/res/layout/folder_list_item.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/note_edit.xml b/src/Notes-master1/app/src/main/res/layout/note_edit.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/note_edit.xml rename to src/Notes-master1/app/src/main/res/layout/note_edit.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/note_edit_list_item.xml b/src/Notes-master1/app/src/main/res/layout/note_edit_list_item.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/note_edit_list_item.xml rename to src/Notes-master1/app/src/main/res/layout/note_edit_list_item.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/note_item.xml b/src/Notes-master1/app/src/main/res/layout/note_item.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/note_item.xml rename to src/Notes-master1/app/src/main/res/layout/note_item.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/note_list.xml b/src/Notes-master1/app/src/main/res/layout/note_list.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/note_list.xml rename to src/Notes-master1/app/src/main/res/layout/note_list.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/Notes-master1/app/src/main/res/layout/note_list_dropdown_menu.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/note_list_dropdown_menu.xml rename to src/Notes-master1/app/src/main/res/layout/note_list_dropdown_menu.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/note_list_footer.xml b/src/Notes-master1/app/src/main/res/layout/note_list_footer.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/note_list_footer.xml rename to src/Notes-master1/app/src/main/res/layout/note_list_footer.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/settings_header.xml b/src/Notes-master1/app/src/main/res/layout/settings_header.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/settings_header.xml rename to src/Notes-master1/app/src/main/res/layout/settings_header.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/widget_2x.xml b/src/Notes-master1/app/src/main/res/layout/widget_2x.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/widget_2x.xml rename to src/Notes-master1/app/src/main/res/layout/widget_2x.xml diff --git a/scr/Notes-master1/app/src/main/res/layout/widget_4x.xml b/src/Notes-master1/app/src/main/res/layout/widget_4x.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/layout/widget_4x.xml rename to src/Notes-master1/app/src/main/res/layout/widget_4x.xml diff --git a/scr/Notes-master1/app/src/main/res/menu/call_note_edit.xml b/src/Notes-master1/app/src/main/res/menu/call_note_edit.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/menu/call_note_edit.xml rename to src/Notes-master1/app/src/main/res/menu/call_note_edit.xml diff --git a/scr/Notes-master1/app/src/main/res/menu/call_record_folder.xml b/src/Notes-master1/app/src/main/res/menu/call_record_folder.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/menu/call_record_folder.xml rename to src/Notes-master1/app/src/main/res/menu/call_record_folder.xml diff --git a/scr/Notes-master1/app/src/main/res/menu/note_edit.xml b/src/Notes-master1/app/src/main/res/menu/note_edit.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/menu/note_edit.xml rename to src/Notes-master1/app/src/main/res/menu/note_edit.xml diff --git a/scr/Notes-master1/app/src/main/res/menu/note_list.xml b/src/Notes-master1/app/src/main/res/menu/note_list.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/menu/note_list.xml rename to src/Notes-master1/app/src/main/res/menu/note_list.xml diff --git a/scr/Notes-master1/app/src/main/res/menu/note_list_dropdown.xml b/src/Notes-master1/app/src/main/res/menu/note_list_dropdown.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/menu/note_list_dropdown.xml rename to src/Notes-master1/app/src/main/res/menu/note_list_dropdown.xml diff --git a/scr/Notes-master1/app/src/main/res/menu/note_list_options.xml b/src/Notes-master1/app/src/main/res/menu/note_list_options.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/menu/note_list_options.xml rename to src/Notes-master1/app/src/main/res/menu/note_list_options.xml diff --git a/scr/Notes-master1/app/src/main/res/menu/sub_folder.xml b/src/Notes-master1/app/src/main/res/menu/sub_folder.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/menu/sub_folder.xml rename to src/Notes-master1/app/src/main/res/menu/sub_folder.xml diff --git a/scr/Notes-master1/app/src/main/res/raw-zh-rCN/introduction b/src/Notes-master1/app/src/main/res/raw-zh-rCN/introduction similarity index 100% rename from scr/Notes-master1/app/src/main/res/raw-zh-rCN/introduction rename to src/Notes-master1/app/src/main/res/raw-zh-rCN/introduction diff --git a/scr/Notes-master1/app/src/main/res/raw/introduction b/src/Notes-master1/app/src/main/res/raw/introduction similarity index 100% rename from scr/Notes-master1/app/src/main/res/raw/introduction rename to src/Notes-master1/app/src/main/res/raw/introduction diff --git a/scr/Notes-master1/app/src/main/res/values-zh-rCN/arrays.xml b/src/Notes-master1/app/src/main/res/values-zh-rCN/arrays.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/values-zh-rCN/arrays.xml rename to src/Notes-master1/app/src/main/res/values-zh-rCN/arrays.xml diff --git a/scr/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml rename to src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml diff --git a/scr/Notes-master1/app/src/main/res/values-zh-rTW/arrays.xml b/src/Notes-master1/app/src/main/res/values-zh-rTW/arrays.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/values-zh-rTW/arrays.xml rename to src/Notes-master1/app/src/main/res/values-zh-rTW/arrays.xml diff --git a/scr/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml rename to src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml diff --git a/scr/Notes-master1/app/src/main/res/values/arrays.xml b/src/Notes-master1/app/src/main/res/values/arrays.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/values/arrays.xml rename to src/Notes-master1/app/src/main/res/values/arrays.xml diff --git a/scr/Notes-master1/app/src/main/res/values/colors.xml b/src/Notes-master1/app/src/main/res/values/colors.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/values/colors.xml rename to src/Notes-master1/app/src/main/res/values/colors.xml diff --git a/scr/Notes-master1/app/src/main/res/values/dimens.xml b/src/Notes-master1/app/src/main/res/values/dimens.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/values/dimens.xml rename to src/Notes-master1/app/src/main/res/values/dimens.xml diff --git a/scr/Notes-master1/app/src/main/res/values/strings.xml b/src/Notes-master1/app/src/main/res/values/strings.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/values/strings.xml rename to src/Notes-master1/app/src/main/res/values/strings.xml diff --git a/scr/Notes-master1/app/src/main/res/values/styles.xml b/src/Notes-master1/app/src/main/res/values/styles.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/values/styles.xml rename to src/Notes-master1/app/src/main/res/values/styles.xml diff --git a/scr/Notes-master1/app/src/main/res/xml/preferences.xml b/src/Notes-master1/app/src/main/res/xml/preferences.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/xml/preferences.xml rename to src/Notes-master1/app/src/main/res/xml/preferences.xml diff --git a/scr/Notes-master1/app/src/main/res/xml/searchable.xml b/src/Notes-master1/app/src/main/res/xml/searchable.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/xml/searchable.xml rename to src/Notes-master1/app/src/main/res/xml/searchable.xml diff --git a/scr/Notes-master1/app/src/main/res/xml/widget_2x_info.xml b/src/Notes-master1/app/src/main/res/xml/widget_2x_info.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/xml/widget_2x_info.xml rename to src/Notes-master1/app/src/main/res/xml/widget_2x_info.xml diff --git a/scr/Notes-master1/app/src/main/res/xml/widget_4x_info.xml b/src/Notes-master1/app/src/main/res/xml/widget_4x_info.xml similarity index 100% rename from scr/Notes-master1/app/src/main/res/xml/widget_4x_info.xml rename to src/Notes-master1/app/src/main/res/xml/widget_4x_info.xml diff --git a/scr/Notes-master1/build.gradle b/src/Notes-master1/build.gradle similarity index 100% rename from scr/Notes-master1/build.gradle rename to src/Notes-master1/build.gradle diff --git a/scr/Notes-master1/gradle/wrapper/gradle-wrapper.jar b/src/Notes-master1/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from scr/Notes-master1/gradle/wrapper/gradle-wrapper.jar rename to src/Notes-master1/gradle/wrapper/gradle-wrapper.jar diff --git a/scr/Notes-master1/gradle/wrapper/gradle-wrapper.properties b/src/Notes-master1/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from scr/Notes-master1/gradle/wrapper/gradle-wrapper.properties rename to src/Notes-master1/gradle/wrapper/gradle-wrapper.properties diff --git a/scr/Notes-master1/gradlew b/src/Notes-master1/gradlew similarity index 100% rename from scr/Notes-master1/gradlew rename to src/Notes-master1/gradlew diff --git a/scr/Notes-master1/gradlew.bat b/src/Notes-master1/gradlew.bat similarity index 100% rename from scr/Notes-master1/gradlew.bat rename to src/Notes-master1/gradlew.bat diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/LICENSE.txt b/src/Notes-master1/httpcomponents-client-4.5.14-bin/LICENSE.txt similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/LICENSE.txt rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/LICENSE.txt diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/NOTICE.txt b/src/Notes-master1/httpcomponents-client-4.5.14-bin/NOTICE.txt similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/NOTICE.txt rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/NOTICE.txt diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt b/src/Notes-master1/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/allclasses-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/allclasses-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/allclasses-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/allclasses-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/allclasses-noframe.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/allclasses-noframe.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/allclasses-noframe.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/allclasses-noframe.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/constant-values.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/constant-values.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/constant-values.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/constant-values.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/deprecated-list.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/deprecated-list.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/deprecated-list.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/deprecated-list.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/help-doc.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/help-doc.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/help-doc.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/help-doc.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/index-all.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/index-all.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/index-all.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/index-all.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/index.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/index.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/index.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/index.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AUTH.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AUTH.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AUTH.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AUTH.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthOption.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthOption.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthOption.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthOption.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthProtocolState.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthProtocolState.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthProtocolState.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthProtocolState.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeRegistry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeRegistry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeRegistry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthSchemeRegistry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScope.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScope.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScope.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthScope.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthState.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthState.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthState.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthState.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthenticationException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthenticationException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthenticationException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/AuthenticationException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/BasicUserPrincipal.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/BasicUserPrincipal.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/BasicUserPrincipal.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/BasicUserPrincipal.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ChallengeState.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ChallengeState.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ChallengeState.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ChallengeState.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ContextAwareAuthScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ContextAwareAuthScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ContextAwareAuthScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/ContextAwareAuthScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/Credentials.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/Credentials.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/Credentials.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/Credentials.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/InvalidCredentialsException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/InvalidCredentialsException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/InvalidCredentialsException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/InvalidCredentialsException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/KerberosCredentials.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/KerberosCredentials.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/KerberosCredentials.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/KerberosCredentials.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/MalformedChallengeException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/MalformedChallengeException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/MalformedChallengeException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/MalformedChallengeException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTCredentials.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTCredentials.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTCredentials.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTCredentials.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTUserPrincipal.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTUserPrincipal.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTUserPrincipal.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/NTUserPrincipal.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/UsernamePasswordCredentials.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/UsernamePasswordCredentials.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/UsernamePasswordCredentials.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/UsernamePasswordCredentials.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AUTH.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AUTH.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AUTH.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AUTH.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthOption.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthOption.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthOption.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthOption.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthProtocolState.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthProtocolState.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthProtocolState.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthProtocolState.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeRegistry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeRegistry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeRegistry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthSchemeRegistry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScope.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScope.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScope.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthScope.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthState.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthState.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthState.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthState.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthenticationException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthenticationException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthenticationException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/AuthenticationException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/BasicUserPrincipal.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/BasicUserPrincipal.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/BasicUserPrincipal.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/BasicUserPrincipal.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ChallengeState.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ChallengeState.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ChallengeState.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ChallengeState.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ContextAwareAuthScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ContextAwareAuthScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ContextAwareAuthScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/ContextAwareAuthScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/Credentials.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/Credentials.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/Credentials.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/Credentials.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/InvalidCredentialsException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/InvalidCredentialsException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/InvalidCredentialsException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/InvalidCredentialsException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/KerberosCredentials.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/KerberosCredentials.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/KerberosCredentials.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/KerberosCredentials.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/MalformedChallengeException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/MalformedChallengeException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/MalformedChallengeException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/MalformedChallengeException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTCredentials.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTCredentials.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTCredentials.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTCredentials.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTUserPrincipal.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTUserPrincipal.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTUserPrincipal.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/NTUserPrincipal.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/UsernamePasswordCredentials.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/UsernamePasswordCredentials.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/UsernamePasswordCredentials.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/class-use/UsernamePasswordCredentials.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParams.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParams.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParams.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/AuthParams.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParams.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParams.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParams.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/class-use/AuthParams.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/auth/params/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/AuthenticationStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/BackoffManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/BackoffManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/BackoffManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/BackoffManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CircularRedirectException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CircularRedirectException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CircularRedirectException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CircularRedirectException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ClientProtocolException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ClientProtocolException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ClientProtocolException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ClientProtocolException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ConnectionBackoffStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ConnectionBackoffStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ConnectionBackoffStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ConnectionBackoffStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CookieStore.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CookieStore.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CookieStore.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CookieStore.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CredentialsProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CredentialsProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CredentialsProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/CredentialsProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpRequestRetryHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpRequestRetryHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpRequestRetryHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpRequestRetryHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpResponseException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpResponseException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpResponseException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/HttpResponseException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/NonRepeatableRequestException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/NonRepeatableRequestException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/NonRepeatableRequestException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/NonRepeatableRequestException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RedirectStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RequestDirector.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RequestDirector.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RequestDirector.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/RequestDirector.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ResponseHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ResponseHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ResponseHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ResponseHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ServiceUnavailableRetryStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ServiceUnavailableRetryStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ServiceUnavailableRetryStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/ServiceUnavailableRetryStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/UserTokenHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/UserTokenHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/UserTokenHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/UserTokenHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/CacheResponseStatus.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/CacheResponseStatus.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/CacheResponseStatus.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/CacheResponseStatus.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HeaderConstants.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HeaderConstants.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HeaderConstants.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HeaderConstants.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheContext.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheContext.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheContext.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheContext.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializationException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializationException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializationException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializationException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializer.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializer.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializer.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheEntrySerializer.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheInvalidator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheInvalidator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheInvalidator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheInvalidator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheStorage.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheStorage.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheStorage.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheStorage.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateCallback.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateCallback.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateCallback.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateCallback.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/HttpCacheUpdateException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/InputLimit.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/InputLimit.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/InputLimit.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/InputLimit.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/Resource.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/Resource.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/Resource.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/Resource.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/ResourceFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/ResourceFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/ResourceFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/ResourceFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/CacheResponseStatus.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/CacheResponseStatus.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/CacheResponseStatus.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/CacheResponseStatus.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HeaderConstants.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HeaderConstants.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HeaderConstants.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HeaderConstants.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheContext.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheContext.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheContext.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheContext.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializationException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializationException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializationException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializationException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializer.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializer.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializer.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheEntrySerializer.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheInvalidator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheInvalidator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheInvalidator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheInvalidator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheStorage.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheStorage.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheStorage.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheStorage.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateCallback.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateCallback.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateCallback.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateCallback.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/HttpCacheUpdateException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/InputLimit.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/InputLimit.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/InputLimit.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/InputLimit.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/Resource.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/Resource.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/Resource.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/Resource.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/ResourceFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/ResourceFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/ResourceFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/class-use/ResourceFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/cache/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/AuthenticationStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/BackoffManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/BackoffManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/BackoffManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/BackoffManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CircularRedirectException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CircularRedirectException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CircularRedirectException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CircularRedirectException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ClientProtocolException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ClientProtocolException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ClientProtocolException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ClientProtocolException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ConnectionBackoffStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ConnectionBackoffStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ConnectionBackoffStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ConnectionBackoffStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CookieStore.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CookieStore.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CookieStore.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CookieStore.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CredentialsProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CredentialsProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CredentialsProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/CredentialsProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpRequestRetryHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpRequestRetryHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpRequestRetryHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpRequestRetryHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpResponseException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpResponseException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpResponseException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/HttpResponseException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/NonRepeatableRequestException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/NonRepeatableRequestException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/NonRepeatableRequestException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/NonRepeatableRequestException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RedirectStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RequestDirector.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RequestDirector.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RequestDirector.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/RequestDirector.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ResponseHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ResponseHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ResponseHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ResponseHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ServiceUnavailableRetryStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ServiceUnavailableRetryStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ServiceUnavailableRetryStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/ServiceUnavailableRetryStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/UserTokenHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/UserTokenHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/UserTokenHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/class-use/UserTokenHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/AuthSchemes.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/AuthSchemes.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/AuthSchemes.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/AuthSchemes.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/CookieSpecs.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/CookieSpecs.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/CookieSpecs.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/CookieSpecs.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.Builder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.Builder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.Builder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.Builder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/RequestConfig.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/AuthSchemes.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/AuthSchemes.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/AuthSchemes.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/AuthSchemes.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/CookieSpecs.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/CookieSpecs.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/CookieSpecs.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/CookieSpecs.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.Builder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.Builder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.Builder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.Builder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/class-use/RequestConfig.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/config/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DecompressingEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DecompressingEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DecompressingEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DecompressingEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateDecompressingEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateDecompressingEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateDecompressingEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateDecompressingEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStream.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStream.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStream.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStream.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStreamFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStreamFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStreamFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/DeflateInputStreamFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/EntityBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/EntityBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/EntityBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/EntityBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GZIPInputStreamFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GZIPInputStreamFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GZIPInputStreamFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GZIPInputStreamFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipCompressingEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipCompressingEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipCompressingEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipCompressingEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipDecompressingEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipDecompressingEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipDecompressingEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/GzipDecompressingEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/InputStreamFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/InputStreamFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/InputStreamFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/InputStreamFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/UrlEncodedFormEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/UrlEncodedFormEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/UrlEncodedFormEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/UrlEncodedFormEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DecompressingEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DecompressingEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DecompressingEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DecompressingEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateDecompressingEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateDecompressingEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateDecompressingEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateDecompressingEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStream.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStream.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStream.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStream.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStreamFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStreamFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStreamFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/DeflateInputStreamFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/EntityBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/EntityBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/EntityBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/EntityBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GZIPInputStreamFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GZIPInputStreamFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GZIPInputStreamFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GZIPInputStreamFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipCompressingEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipCompressingEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipCompressingEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipCompressingEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipDecompressingEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipDecompressingEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipDecompressingEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/GzipDecompressingEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/InputStreamFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/InputStreamFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/InputStreamFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/InputStreamFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/UrlEncodedFormEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/UrlEncodedFormEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/UrlEncodedFormEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/class-use/UrlEncodedFormEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/entity/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Async.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Async.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Async.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Async.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Content.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Content.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Content.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Content.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/ContentResponseHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/ContentResponseHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/ContentResponseHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/ContentResponseHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Executor.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Executor.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Executor.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Executor.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Form.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Form.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Form.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Form.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Request.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Request.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Request.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Request.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Response.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Response.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Response.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/Response.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Async.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Async.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Async.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Async.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Content.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Content.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Content.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Content.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/ContentResponseHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/ContentResponseHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/ContentResponseHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/ContentResponseHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Executor.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Executor.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Executor.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Executor.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Form.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Form.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Form.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Form.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Request.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Request.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Request.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Request.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Response.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Response.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Response.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/class-use/Response.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/fluent/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbortableHttpRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbortableHttpRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbortableHttpRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbortableHttpRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbstractExecutionAwareRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbstractExecutionAwareRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbstractExecutionAwareRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/AbstractExecutionAwareRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/CloseableHttpResponse.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/CloseableHttpResponse.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/CloseableHttpResponse.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/CloseableHttpResponse.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/Configurable.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/Configurable.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/Configurable.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/Configurable.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpDelete.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpDelete.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpDelete.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpDelete.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpExecutionAware.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpExecutionAware.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpExecutionAware.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpExecutionAware.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpGet.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpGet.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpGet.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpGet.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpHead.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpHead.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpHead.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpHead.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpOptions.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpOptions.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpOptions.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpOptions.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPatch.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPatch.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPatch.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPatch.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPost.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPost.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPost.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPost.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPut.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPut.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPut.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpPut.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestBase.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestBase.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestBase.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestBase.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestWrapper.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestWrapper.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestWrapper.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpRequestWrapper.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpTrace.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpTrace.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpTrace.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpTrace.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpUriRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpUriRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpUriRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/HttpUriRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/RequestBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/RequestBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/RequestBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/RequestBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbortableHttpRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbortableHttpRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbortableHttpRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbortableHttpRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbstractExecutionAwareRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbstractExecutionAwareRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbstractExecutionAwareRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/AbstractExecutionAwareRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/CloseableHttpResponse.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/CloseableHttpResponse.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/CloseableHttpResponse.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/CloseableHttpResponse.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/Configurable.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/Configurable.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/Configurable.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/Configurable.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpDelete.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpDelete.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpDelete.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpDelete.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpEntityEnclosingRequestBase.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpEntityEnclosingRequestBase.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpEntityEnclosingRequestBase.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpEntityEnclosingRequestBase.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpExecutionAware.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpExecutionAware.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpExecutionAware.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpExecutionAware.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpGet.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpGet.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpGet.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpGet.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpHead.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpHead.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpHead.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpHead.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpOptions.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpOptions.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpOptions.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpOptions.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPatch.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPatch.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPatch.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPatch.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPost.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPost.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPost.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPost.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPut.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPut.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPut.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpPut.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestBase.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestBase.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestBase.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestBase.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestWrapper.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestWrapper.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestWrapper.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpRequestWrapper.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpTrace.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpTrace.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpTrace.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpTrace.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpUriRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpUriRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpUriRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/HttpUriRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/RequestBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/RequestBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/RequestBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/class-use/RequestBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/methods/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AllClientPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AllClientPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AllClientPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AllClientPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AuthPolicy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AuthPolicy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AuthPolicy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/AuthPolicy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/ClientParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/CookiePolicy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/CookiePolicy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/CookiePolicy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/CookiePolicy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParamConfig.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParamConfig.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParamConfig.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParamConfig.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParams.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParams.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParams.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/HttpClientParams.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AllClientPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AllClientPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AllClientPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AllClientPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AuthPolicy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AuthPolicy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AuthPolicy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/AuthPolicy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/ClientParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/CookiePolicy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/CookiePolicy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/CookiePolicy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/CookiePolicy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParamConfig.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParamConfig.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParamConfig.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParamConfig.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParams.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParams.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParams.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/class-use/HttpClientParams.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/params/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContext.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContext.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContext.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContext.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContextConfigurer.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContextConfigurer.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContextConfigurer.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ClientContextConfigurer.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/HttpClientContext.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/HttpClientContext.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/HttpClientContext.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/HttpClientContext.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAcceptEncoding.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAcceptEncoding.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAcceptEncoding.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAcceptEncoding.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAddCookies.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAddCookies.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAddCookies.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAddCookies.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAuthCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAuthCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAuthCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestAuthCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestClientConnControl.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestClientConnControl.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestClientConnControl.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestClientConnControl.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestDefaultHeaders.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestDefaultHeaders.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestDefaultHeaders.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestDefaultHeaders.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestExpectContinue.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestExpectContinue.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestExpectContinue.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestExpectContinue.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestProxyAuthentication.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestProxyAuthentication.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestProxyAuthentication.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestProxyAuthentication.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestTargetAuthentication.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestTargetAuthentication.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestTargetAuthentication.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/RequestTargetAuthentication.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseAuthCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseAuthCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseAuthCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseAuthCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseContentEncoding.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseContentEncoding.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseContentEncoding.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseContentEncoding.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseProcessCookies.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseProcessCookies.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseProcessCookies.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/ResponseProcessCookies.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContext.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContext.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContext.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContext.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContextConfigurer.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContextConfigurer.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContextConfigurer.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ClientContextConfigurer.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/HttpClientContext.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/HttpClientContext.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/HttpClientContext.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/HttpClientContext.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAcceptEncoding.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAcceptEncoding.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAcceptEncoding.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAcceptEncoding.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAddCookies.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAddCookies.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAddCookies.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAddCookies.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAuthCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAuthCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAuthCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestAuthCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestClientConnControl.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestClientConnControl.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestClientConnControl.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestClientConnControl.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestDefaultHeaders.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestDefaultHeaders.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestDefaultHeaders.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestDefaultHeaders.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestExpectContinue.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestExpectContinue.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestExpectContinue.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestExpectContinue.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestProxyAuthentication.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestProxyAuthentication.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestProxyAuthentication.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestProxyAuthentication.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestTargetAuthentication.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestTargetAuthentication.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestTargetAuthentication.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/RequestTargetAuthentication.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseAuthCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseAuthCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseAuthCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseAuthCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseContentEncoding.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseContentEncoding.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseContentEncoding.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseContentEncoding.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseProcessCookies.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseProcessCookies.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseProcessCookies.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/class-use/ResponseProcessCookies.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/protocol/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/CloneUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/CloneUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/CloneUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/CloneUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/DateUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/DateUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/DateUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/DateUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/HttpClientUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/HttpClientUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/HttpClientUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/HttpClientUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Idn.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Idn.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Idn.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Idn.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/JdkIdn.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/JdkIdn.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/JdkIdn.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/JdkIdn.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Punycode.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Punycode.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Punycode.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Punycode.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Rfc3492Idn.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Rfc3492Idn.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Rfc3492Idn.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/Rfc3492Idn.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.UriFlag.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.UriFlag.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.UriFlag.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.UriFlag.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URIUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URLEncodedUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URLEncodedUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URLEncodedUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/URLEncodedUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/CloneUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/CloneUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/CloneUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/CloneUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/DateUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/DateUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/DateUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/DateUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/HttpClientUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/HttpClientUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/HttpClientUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/HttpClientUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Idn.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Idn.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Idn.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Idn.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/JdkIdn.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/JdkIdn.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/JdkIdn.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/JdkIdn.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Punycode.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Punycode.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Punycode.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Punycode.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Rfc3492Idn.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Rfc3492Idn.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Rfc3492Idn.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/Rfc3492Idn.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.UriFlag.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.UriFlag.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.UriFlag.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.UriFlag.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URIUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URLEncodedUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URLEncodedUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URLEncodedUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/class-use/URLEncodedUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/client/utils/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicEofSensorWatcher.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicEofSensorWatcher.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicEofSensorWatcher.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicEofSensorWatcher.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicManagedEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicManagedEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicManagedEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/BasicManagedEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManagerFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManagerFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManagerFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionManagerFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionOperator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionOperator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionOperator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionOperator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ClientConnectionRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectTimeoutException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectTimeoutException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectTimeoutException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectTimeoutException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionKeepAliveStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionKeepAliveStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionKeepAliveStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionKeepAliveStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionPoolTimeoutException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionPoolTimeoutException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionPoolTimeoutException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionPoolTimeoutException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionReleaseTrigger.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionReleaseTrigger.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionReleaseTrigger.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionReleaseTrigger.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ConnectionRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/DnsResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/DnsResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/DnsResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/DnsResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorInputStream.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorInputStream.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorInputStream.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorInputStream.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorWatcher.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorWatcher.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorWatcher.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/EofSensorWatcher.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionOperator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionOperator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionOperator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpClientConnectionOperator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpConnectionFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpConnectionFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpConnectionFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpConnectionFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpHostConnectException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpHostConnectException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpHostConnectException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpHostConnectException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpInetSocketAddress.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpInetSocketAddress.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpInetSocketAddress.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpInetSocketAddress.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpRoutedConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpRoutedConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpRoutedConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/HttpRoutedConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedClientConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedClientConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedClientConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedClientConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedHttpClientConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedHttpClientConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedHttpClientConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ManagedHttpClientConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/MultihomePlainSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/MultihomePlainSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/MultihomePlainSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/MultihomePlainSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/OperatedClientConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/OperatedClientConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/OperatedClientConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/OperatedClientConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/SchemePortResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/SchemePortResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/SchemePortResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/SchemePortResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/UnsupportedSchemeException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/UnsupportedSchemeException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/UnsupportedSchemeException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/UnsupportedSchemeException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicEofSensorWatcher.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicEofSensorWatcher.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicEofSensorWatcher.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicEofSensorWatcher.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicManagedEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicManagedEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicManagedEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/BasicManagedEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManagerFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManagerFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManagerFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionManagerFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionOperator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionOperator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionOperator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionOperator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ClientConnectionRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectTimeoutException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectTimeoutException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectTimeoutException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectTimeoutException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionKeepAliveStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionKeepAliveStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionKeepAliveStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionKeepAliveStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionPoolTimeoutException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionPoolTimeoutException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionPoolTimeoutException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionPoolTimeoutException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionReleaseTrigger.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionReleaseTrigger.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionReleaseTrigger.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionReleaseTrigger.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ConnectionRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/DnsResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/DnsResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/DnsResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/DnsResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorInputStream.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorInputStream.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorInputStream.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorInputStream.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorWatcher.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorWatcher.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorWatcher.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/EofSensorWatcher.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionOperator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionOperator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionOperator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpClientConnectionOperator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpConnectionFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpConnectionFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpConnectionFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpConnectionFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpHostConnectException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpHostConnectException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpHostConnectException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpHostConnectException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpInetSocketAddress.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpInetSocketAddress.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpInetSocketAddress.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpInetSocketAddress.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpRoutedConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpRoutedConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpRoutedConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/HttpRoutedConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedClientConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedClientConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedClientConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedClientConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedHttpClientConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedHttpClientConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedHttpClientConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/ManagedHttpClientConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/MultihomePlainSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/MultihomePlainSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/MultihomePlainSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/MultihomePlainSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/OperatedClientConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/OperatedClientConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/OperatedClientConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/OperatedClientConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/SchemePortResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/SchemePortResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/SchemePortResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/SchemePortResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/UnsupportedSchemeException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/UnsupportedSchemeException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/UnsupportedSchemeException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/class-use/UnsupportedSchemeException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnConnectionParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParams.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParams.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParams.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnManagerParams.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRoute.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRoute.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRoute.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRoute.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRouteBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRouteBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRouteBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnPerRouteBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRoutePNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRoutePNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRoutePNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRoutePNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParams.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParams.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParams.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/ConnRouteParams.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnConnectionParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParams.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParams.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParams.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnManagerParams.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRoute.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRoute.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRoute.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRoute.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRouteBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRouteBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRouteBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnPerRouteBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRoutePNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRoutePNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRoutePNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRoutePNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParams.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParams.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParams.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/class-use/ConnRouteParams.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/params/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/BasicRouteDirector.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/BasicRouteDirector.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/BasicRouteDirector.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/BasicRouteDirector.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoute.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoute.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoute.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoute.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRouteDirector.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRouteDirector.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRouteDirector.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRouteDirector.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/HttpRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.LayerType.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.LayerType.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.LayerType.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.LayerType.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.TunnelType.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.TunnelType.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.TunnelType.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.TunnelType.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteInfo.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteTracker.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteTracker.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteTracker.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/RouteTracker.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/BasicRouteDirector.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/BasicRouteDirector.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/BasicRouteDirector.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/BasicRouteDirector.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoute.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoute.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoute.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoute.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRouteDirector.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRouteDirector.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRouteDirector.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRouteDirector.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/HttpRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.LayerType.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.LayerType.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.LayerType.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.LayerType.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.TunnelType.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.TunnelType.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.TunnelType.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.TunnelType.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteInfo.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteTracker.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteTracker.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteTracker.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/class-use/RouteTracker.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/routing/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/HostNameResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/HostNameResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/HostNameResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/HostNameResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/LayeredSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/PlainSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/PlainSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/PlainSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/PlainSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/Scheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/Scheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/Scheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/Scheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeLayeredSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeLayeredSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeLayeredSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeLayeredSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeRegistry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeRegistry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeRegistry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeRegistry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SchemeSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/SocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/HostNameResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/HostNameResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/HostNameResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/HostNameResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSchemeSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSchemeSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSchemeSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSchemeSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/LayeredSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/PlainSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/PlainSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/PlainSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/PlainSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/Scheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/Scheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/Scheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/Scheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeLayeredSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeLayeredSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeLayeredSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeLayeredSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeRegistry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeRegistry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeRegistry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeRegistry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SchemeSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/class-use/SocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/scheme/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/ConnectionSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/ConnectionSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/ConnectionSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/ConnectionSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/LayeredConnectionSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/LayeredConnectionSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/LayeredConnectionSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/LayeredConnectionSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/PlainConnectionSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/PlainConnectionSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/PlainConnectionSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/PlainConnectionSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/ConnectionSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/ConnectionSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/ConnectionSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/ConnectionSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/LayeredConnectionSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/LayeredConnectionSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/LayeredConnectionSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/LayeredConnectionSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/PlainConnectionSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/PlainConnectionSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/PlainConnectionSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/class-use/PlainConnectionSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/socket/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AbstractVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AbstractVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AbstractVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AbstractVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AllowAllHostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AllowAllHostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AllowAllHostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/AllowAllHostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/DefaultHostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/DefaultHostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/DefaultHostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/DefaultHostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/NoopHostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/NoopHostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/NoopHostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/NoopHostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyDetails.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyDetails.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyDetails.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyDetails.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/PrivateKeyStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLConnectionSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLConnectionSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLConnectionSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLConnectionSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContextBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContextBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContextBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContextBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContexts.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContexts.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContexts.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLContexts.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLInitializationException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLInitializationException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLInitializationException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLInitializationException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/SSLSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/StrictHostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/StrictHostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/StrictHostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/StrictHostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustAllStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustAllStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustAllStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustAllStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustSelfSignedStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustSelfSignedStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustSelfSignedStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustSelfSignedStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/TrustStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/X509HostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/X509HostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/X509HostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/X509HostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AbstractVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AbstractVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AbstractVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AbstractVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AllowAllHostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AllowAllHostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AllowAllHostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/AllowAllHostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/BrowserCompatHostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/BrowserCompatHostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/BrowserCompatHostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/BrowserCompatHostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/DefaultHostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/DefaultHostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/DefaultHostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/DefaultHostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/NoopHostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/NoopHostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/NoopHostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/NoopHostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyDetails.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyDetails.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyDetails.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyDetails.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/PrivateKeyStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLConnectionSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLConnectionSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLConnectionSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLConnectionSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContextBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContextBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContextBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContextBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContexts.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContexts.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContexts.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLContexts.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLInitializationException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLInitializationException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLInitializationException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLInitializationException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLSocketFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLSocketFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLSocketFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/SSLSocketFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/StrictHostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/StrictHostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/StrictHostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/StrictHostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustAllStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustAllStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustAllStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustAllStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustSelfSignedStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustSelfSignedStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustSelfSignedStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustSelfSignedStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/TrustStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/X509HostnameVerifier.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/X509HostnameVerifier.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/X509HostnameVerifier.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/class-use/X509HostnameVerifier.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/ssl/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DnsUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DnsUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DnsUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DnsUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DomainType.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DomainType.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DomainType.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/DomainType.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/InetAddressUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/InetAddressUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/InetAddressUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/InetAddressUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixList.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixList.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixList.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixList.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixListParser.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixListParser.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixListParser.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixListParser.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcher.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcher.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcher.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcher.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcherLoader.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcherLoader.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcherLoader.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/PublicSuffixMatcherLoader.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DnsUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DnsUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DnsUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DnsUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DomainType.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DomainType.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DomainType.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/DomainType.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/InetAddressUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/InetAddressUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/InetAddressUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/InetAddressUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixList.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixList.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixList.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixList.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixListParser.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixListParser.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixListParser.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixListParser.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcher.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcher.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcher.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcher.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcherLoader.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcherLoader.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcherLoader.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/class-use/PublicSuffixMatcherLoader.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/conn/util/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/ClientCookie.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/ClientCookie.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/ClientCookie.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/ClientCookie.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CommonCookieAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CommonCookieAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CommonCookieAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CommonCookieAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/Cookie.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/Cookie.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/Cookie.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/Cookie.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieIdentityComparator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieIdentityComparator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieIdentityComparator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieIdentityComparator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieOrigin.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieOrigin.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieOrigin.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieOrigin.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePathComparator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePathComparator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePathComparator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePathComparator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePriorityComparator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePriorityComparator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePriorityComparator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookiePriorityComparator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieRestrictionViolationException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieRestrictionViolationException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieRestrictionViolationException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieRestrictionViolationException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecRegistry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecRegistry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecRegistry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/CookieSpecRegistry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/MalformedCookieException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/MalformedCookieException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/MalformedCookieException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/MalformedCookieException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SM.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SM.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SM.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SM.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie2.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie2.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie2.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/SetCookie2.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/ClientCookie.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/ClientCookie.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/ClientCookie.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/ClientCookie.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CommonCookieAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CommonCookieAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CommonCookieAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CommonCookieAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/Cookie.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/Cookie.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/Cookie.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/Cookie.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieIdentityComparator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieIdentityComparator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieIdentityComparator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieIdentityComparator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieOrigin.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieOrigin.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieOrigin.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieOrigin.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePathComparator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePathComparator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePathComparator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePathComparator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePriorityComparator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePriorityComparator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePriorityComparator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookiePriorityComparator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieRestrictionViolationException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieRestrictionViolationException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieRestrictionViolationException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieRestrictionViolationException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecRegistry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecRegistry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecRegistry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/CookieSpecRegistry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/MalformedCookieException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/MalformedCookieException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/MalformedCookieException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/MalformedCookieException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SM.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SM.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SM.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SM.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie2.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie2.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie2.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/class-use/SetCookie2.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/CookieSpecParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecPNames.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecPNames.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecPNames.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecPNames.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecParamBean.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecParamBean.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecParamBean.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/class-use/CookieSpecParamBean.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/cookie/params/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPart.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPart.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPart.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPart.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPartBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPartBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPartBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/FormBodyPartBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/Header.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/Header.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/Header.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/Header.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipart.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipart.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipart.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipart.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipartMode.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipartMode.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipartMode.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/HttpMultipartMode.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MIME.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MIME.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MIME.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MIME.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MinimalField.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MinimalField.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MinimalField.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MinimalField.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntityBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntityBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntityBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/MultipartEntityBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPart.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPart.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPart.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPart.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPartBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPartBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPartBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/FormBodyPartBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/Header.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/Header.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/Header.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/Header.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipart.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipart.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipart.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipart.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipartMode.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipartMode.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipartMode.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/HttpMultipartMode.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MIME.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MIME.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MIME.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MIME.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MinimalField.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MinimalField.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MinimalField.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MinimalField.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntity.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntity.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntity.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntity.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntityBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntityBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntityBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/class-use/MultipartEntityBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/AbstractContentBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/AbstractContentBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/AbstractContentBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/AbstractContentBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ByteArrayBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ByteArrayBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ByteArrayBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ByteArrayBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentDescriptor.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentDescriptor.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentDescriptor.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/ContentDescriptor.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/FileBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/FileBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/FileBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/FileBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/InputStreamBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/InputStreamBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/InputStreamBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/InputStreamBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/StringBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/StringBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/StringBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/StringBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/AbstractContentBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/AbstractContentBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/AbstractContentBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/AbstractContentBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ByteArrayBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ByteArrayBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ByteArrayBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ByteArrayBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentDescriptor.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentDescriptor.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentDescriptor.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/ContentDescriptor.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/FileBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/FileBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/FileBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/FileBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/InputStreamBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/InputStreamBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/InputStreamBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/InputStreamBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/StringBody.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/StringBody.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/StringBody.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/class-use/StringBody.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/content/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/entity/mime/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/AuthSchemeBase.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/AuthSchemeBase.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/AuthSchemeBase.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/AuthSchemeBase.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/BasicSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/DigestSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/GGSSchemeBase.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/GGSSchemeBase.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/GGSSchemeBase.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/GGSSchemeBase.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/HttpAuthenticator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/HttpAuthenticator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/HttpAuthenticator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/HttpAuthenticator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/KerberosSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngine.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngine.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngine.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngine.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngineException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngineException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngineException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMEngineException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NTLMSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/NegotiateSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/RFC2617Scheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/RFC2617Scheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/RFC2617Scheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/RFC2617Scheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SPNegoSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SpnegoTokenGenerator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SpnegoTokenGenerator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SpnegoTokenGenerator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/SpnegoTokenGenerator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/AuthSchemeBase.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/AuthSchemeBase.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/AuthSchemeBase.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/AuthSchemeBase.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/BasicSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/DigestSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/GGSSchemeBase.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/GGSSchemeBase.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/GGSSchemeBase.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/GGSSchemeBase.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/HttpAuthenticator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/HttpAuthenticator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/HttpAuthenticator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/HttpAuthenticator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/KerberosSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngine.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngine.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngine.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngine.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngineException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngineException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngineException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMEngineException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NTLMSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/NegotiateSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/RFC2617Scheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/RFC2617Scheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/RFC2617Scheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/RFC2617Scheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SPNegoSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SpnegoTokenGenerator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SpnegoTokenGenerator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SpnegoTokenGenerator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/SpnegoTokenGenerator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/UnsupportedDigestAlgorithmException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/UnsupportedDigestAlgorithmException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/UnsupportedDigestAlgorithmException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/class-use/UnsupportedDigestAlgorithmException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/CurrentWindowsCredentials.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/CurrentWindowsCredentials.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/CurrentWindowsCredentials.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/CurrentWindowsCredentials.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsCredentialsProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsCredentialsProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsCredentialsProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsCredentialsProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/CurrentWindowsCredentials.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/CurrentWindowsCredentials.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/CurrentWindowsCredentials.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/CurrentWindowsCredentials.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsCredentialsProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsCredentialsProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsCredentialsProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsCredentialsProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNTLMSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNTLMSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNTLMSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNTLMSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateSchemeFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateSchemeFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateSchemeFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/class-use/WindowsNegotiateSchemeFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/auth/win/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AIMDBackoffManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AIMDBackoffManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AIMDBackoffManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AIMDBackoffManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractAuthenticationHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractAuthenticationHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractAuthenticationHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractAuthenticationHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractResponseHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractResponseHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractResponseHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AbstractResponseHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AutoRetryHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AutoRetryHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AutoRetryHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/AutoRetryHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicAuthCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicAuthCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicAuthCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicAuthCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCookieStore.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCookieStore.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCookieStore.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCookieStore.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCredentialsProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCredentialsProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCredentialsProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicCredentialsProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicResponseHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicResponseHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicResponseHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/BasicResponseHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ClientParamsStack.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ClientParamsStack.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ClientParamsStack.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ClientParamsStack.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CloseableHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CloseableHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CloseableHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CloseableHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ContentEncodingHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ContentEncodingHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ContentEncodingHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ContentEncodingHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CookieSpecRegistries.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CookieSpecRegistries.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CookieSpecRegistries.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/CookieSpecRegistries.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DecompressingHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DecompressingHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DecompressingHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DecompressingHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultBackoffStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultBackoffStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultBackoffStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultBackoffStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultClientConnectionReuseStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultClientConnectionReuseStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultClientConnectionReuseStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultClientConnectionReuseStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRedirectStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRequestDirector.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRequestDirector.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRequestDirector.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultRequestDirector.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultUserTokenHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultUserTokenHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultUserTokenHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/DefaultUserTokenHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/EntityEnclosingRequestWrapper.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/EntityEnclosingRequestWrapper.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/EntityEnclosingRequestWrapper.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/EntityEnclosingRequestWrapper.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionMetrics.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionMetrics.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionMetrics.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionMetrics.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionService.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionService.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionService.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/FutureRequestExecutionService.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpAuthenticator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpAuthenticator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpAuthenticator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpAuthenticator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClientBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClientBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClientBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClientBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClients.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClients.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClients.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpClients.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpRequestFutureTask.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpRequestFutureTask.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpRequestFutureTask.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/HttpRequestFutureTask.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/IdleConnectionEvictor.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/IdleConnectionEvictor.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/IdleConnectionEvictor.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/IdleConnectionEvictor.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/LaxRedirectStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/LaxRedirectStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/LaxRedirectStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/LaxRedirectStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NoopUserTokenHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NoopUserTokenHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NoopUserTokenHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NoopUserTokenHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NullBackoffStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NullBackoffStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NullBackoffStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/NullBackoffStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyAuthenticationStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyAuthenticationStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyAuthenticationStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyAuthenticationStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/ProxyClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RedirectLocations.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RedirectLocations.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RedirectLocations.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RedirectLocations.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RequestWrapper.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RequestWrapper.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RequestWrapper.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RequestWrapper.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RoutedRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RoutedRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RoutedRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/RoutedRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/StandardHttpRequestRetryHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/StandardHttpRequestRetryHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/StandardHttpRequestRetryHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/StandardHttpRequestRetryHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultCredentialsProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultCredentialsProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultCredentialsProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultCredentialsProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/SystemDefaultHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TargetAuthenticationStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TargetAuthenticationStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TargetAuthenticationStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TargetAuthenticationStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TunnelRefusedException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TunnelRefusedException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TunnelRefusedException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/TunnelRefusedException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/WinHttpClients.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/WinHttpClients.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/WinHttpClients.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/WinHttpClients.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/AsynchronousValidationRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/AsynchronousValidationRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/AsynchronousValidationRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/AsynchronousValidationRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/BasicHttpCacheStorage.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/BasicHttpCacheStorage.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/BasicHttpCacheStorage.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/BasicHttpCacheStorage.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.Builder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.Builder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.Builder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.Builder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CacheConfig.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClientBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClientBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClientBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClientBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClients.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClients.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClients.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/CachingHttpClients.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultFailureCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultFailureCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultFailureCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultFailureCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/DefaultHttpCacheEntrySerializer.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ExponentialBackOffSchedulingStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCacheValue.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCacheValue.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCacheValue.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FailureCacheValue.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResource.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResource.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResource.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResource.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResourceFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResourceFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResourceFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/FileResourceFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResource.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResource.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResource.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResource.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResourceFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResourceFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResourceFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/HeapResourceFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ImmediateSchedulingStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/SchedulingStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/SchedulingStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/SchedulingStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/SchedulingStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/AsynchronousValidationRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/AsynchronousValidationRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/AsynchronousValidationRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/AsynchronousValidationRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/BasicHttpCacheStorage.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/BasicHttpCacheStorage.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/BasicHttpCacheStorage.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/BasicHttpCacheStorage.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.Builder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.Builder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.Builder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.Builder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CacheConfig.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClientBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClientBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClientBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClientBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClients.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClients.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClients.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/CachingHttpClients.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultFailureCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultFailureCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultFailureCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultFailureCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultHttpCacheEntrySerializer.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultHttpCacheEntrySerializer.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultHttpCacheEntrySerializer.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/DefaultHttpCacheEntrySerializer.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ExponentialBackOffSchedulingStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ExponentialBackOffSchedulingStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ExponentialBackOffSchedulingStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ExponentialBackOffSchedulingStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCacheValue.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCacheValue.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCacheValue.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FailureCacheValue.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResource.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResource.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResource.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResource.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResourceFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResourceFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResourceFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/FileResourceFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResource.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResource.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResource.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResource.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResourceFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResourceFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResourceFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/HeapResourceFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ImmediateSchedulingStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ImmediateSchedulingStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ImmediateSchedulingStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ImmediateSchedulingStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ManagedHttpCacheStorage.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ManagedHttpCacheStorage.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ManagedHttpCacheStorage.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/ManagedHttpCacheStorage.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/SchedulingStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/SchedulingStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/SchedulingStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/class-use/SchedulingStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/class-use/EhcacheHttpCacheStorage.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/class-use/EhcacheHttpCacheStorage.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/class-use/EhcacheHttpCacheStorage.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/class-use/EhcacheHttpCacheStorage.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/ehcache/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/KeyHashingScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/KeyHashingScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/KeyHashingScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/KeyHashingScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/KeyHashingScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/KeyHashingScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/KeyHashingScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/KeyHashingScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactoryImpl.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactoryImpl.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactoryImpl.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryFactoryImpl.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryImpl.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryImpl.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryImpl.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedCacheEntryImpl.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedHttpCacheStorage.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedHttpCacheStorage.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedHttpCacheStorage.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedHttpCacheStorage.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedKeyHashingException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedKeyHashingException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedKeyHashingException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedKeyHashingException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedSerializationException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedSerializationException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedSerializationException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/MemcachedSerializationException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/PrefixKeyHashingScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/PrefixKeyHashingScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/PrefixKeyHashingScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/PrefixKeyHashingScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/SHA256KeyHashingScheme.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/SHA256KeyHashingScheme.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/SHA256KeyHashingScheme.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/class-use/SHA256KeyHashingScheme.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/memcached/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/cache/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AIMDBackoffManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AIMDBackoffManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AIMDBackoffManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AIMDBackoffManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractAuthenticationHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractAuthenticationHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractAuthenticationHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractAuthenticationHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractResponseHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractResponseHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractResponseHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AbstractResponseHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AutoRetryHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AutoRetryHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AutoRetryHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/AutoRetryHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicAuthCache.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicAuthCache.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicAuthCache.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicAuthCache.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCookieStore.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCookieStore.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCookieStore.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCookieStore.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCredentialsProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCredentialsProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCredentialsProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicCredentialsProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicResponseHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicResponseHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicResponseHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/BasicResponseHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ClientParamsStack.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ClientParamsStack.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ClientParamsStack.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ClientParamsStack.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CloseableHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CloseableHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CloseableHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CloseableHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ContentEncodingHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ContentEncodingHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ContentEncodingHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ContentEncodingHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CookieSpecRegistries.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CookieSpecRegistries.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CookieSpecRegistries.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/CookieSpecRegistries.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DecompressingHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DecompressingHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DecompressingHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DecompressingHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultBackoffStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultBackoffStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultBackoffStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultBackoffStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultClientConnectionReuseStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultClientConnectionReuseStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultClientConnectionReuseStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultClientConnectionReuseStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultConnectionKeepAliveStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultConnectionKeepAliveStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultConnectionKeepAliveStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultConnectionKeepAliveStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpRequestRetryHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpRequestRetryHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpRequestRetryHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultHttpRequestRetryHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultProxyAuthenticationHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultProxyAuthenticationHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultProxyAuthenticationHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultProxyAuthenticationHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRedirectStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRequestDirector.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRequestDirector.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRequestDirector.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultRequestDirector.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultServiceUnavailableRetryStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultServiceUnavailableRetryStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultServiceUnavailableRetryStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultServiceUnavailableRetryStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultTargetAuthenticationHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultTargetAuthenticationHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultTargetAuthenticationHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultTargetAuthenticationHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultUserTokenHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultUserTokenHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultUserTokenHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/DefaultUserTokenHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/EntityEnclosingRequestWrapper.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/EntityEnclosingRequestWrapper.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/EntityEnclosingRequestWrapper.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/EntityEnclosingRequestWrapper.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionMetrics.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionMetrics.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionMetrics.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionMetrics.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionService.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionService.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionService.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/FutureRequestExecutionService.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpAuthenticator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpAuthenticator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpAuthenticator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpAuthenticator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClientBuilder.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClientBuilder.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClientBuilder.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClientBuilder.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClients.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClients.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClients.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpClients.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpRequestFutureTask.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpRequestFutureTask.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpRequestFutureTask.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/HttpRequestFutureTask.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/IdleConnectionEvictor.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/IdleConnectionEvictor.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/IdleConnectionEvictor.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/IdleConnectionEvictor.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/LaxRedirectStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/LaxRedirectStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/LaxRedirectStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/LaxRedirectStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NoopUserTokenHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NoopUserTokenHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NoopUserTokenHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NoopUserTokenHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NullBackoffStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NullBackoffStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NullBackoffStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/NullBackoffStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyAuthenticationStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyAuthenticationStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyAuthenticationStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyAuthenticationStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/ProxyClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RedirectLocations.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RedirectLocations.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RedirectLocations.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RedirectLocations.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RequestWrapper.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RequestWrapper.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RequestWrapper.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RequestWrapper.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RoutedRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RoutedRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RoutedRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/RoutedRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/StandardHttpRequestRetryHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/StandardHttpRequestRetryHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/StandardHttpRequestRetryHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/StandardHttpRequestRetryHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultCredentialsProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultCredentialsProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultCredentialsProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultCredentialsProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultHttpClient.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultHttpClient.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultHttpClient.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/SystemDefaultHttpClient.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TargetAuthenticationStrategy.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TargetAuthenticationStrategy.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TargetAuthenticationStrategy.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TargetAuthenticationStrategy.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TunnelRefusedException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TunnelRefusedException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TunnelRefusedException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/TunnelRefusedException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/WinHttpClients.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/WinHttpClients.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/WinHttpClients.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/class-use/WinHttpClients.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/client/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractClientConnAdapter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractClientConnAdapter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractClientConnAdapter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractClientConnAdapter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPoolEntry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPoolEntry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPoolEntry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPoolEntry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPooledConnAdapter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPooledConnAdapter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPooledConnAdapter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/AbstractPooledConnAdapter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicHttpClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicHttpClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicHttpClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/BasicHttpClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ConnectionShutdownException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ConnectionShutdownException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ConnectionShutdownException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ConnectionShutdownException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnectionOperator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnectionOperator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnectionOperator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultClientConnectionOperator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpClientConnectionOperator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpClientConnectionOperator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpClientConnectionOperator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpClientConnectionOperator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParser.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParser.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParser.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParser.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultHttpRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultProxyRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultProxyRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultProxyRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultProxyRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultResponseParser.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultResponseParser.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultResponseParser.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultResponseParser.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultSchemePortResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultSchemePortResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultSchemePortResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/DefaultSchemePortResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/IdleConnectionHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/IdleConnectionHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/IdleConnectionHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/IdleConnectionHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/InMemoryDnsResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/InMemoryDnsResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/InMemoryDnsResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/InMemoryDnsResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionInputBuffer.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionInputBuffer.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionInputBuffer.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionInputBuffer.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionOutputBuffer.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionOutputBuffer.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionOutputBuffer.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/LoggingSessionOutputBuffer.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ProxySelectorRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ProxySelectorRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ProxySelectorRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/ProxySelectorRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SchemeRegistryFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SchemeRegistryFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SchemeRegistryFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SchemeRegistryFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.ConnAdapter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.ConnAdapter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.ConnAdapter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.ConnAdapter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.PoolEntry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.PoolEntry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.PoolEntry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.PoolEntry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SingleClientConnManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultDnsResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultDnsResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultDnsResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultDnsResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/SystemDefaultRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/Wire.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/Wire.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/Wire.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/Wire.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractClientConnAdapter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractClientConnAdapter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractClientConnAdapter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractClientConnAdapter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPoolEntry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPoolEntry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPoolEntry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPoolEntry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPooledConnAdapter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPooledConnAdapter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPooledConnAdapter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/AbstractPooledConnAdapter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicHttpClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicHttpClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicHttpClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/BasicHttpClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ConnectionShutdownException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ConnectionShutdownException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ConnectionShutdownException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ConnectionShutdownException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnectionOperator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnectionOperator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnectionOperator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultClientConnectionOperator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpClientConnectionOperator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpClientConnectionOperator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpClientConnectionOperator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpClientConnectionOperator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParser.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParser.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParser.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParser.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParserFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParserFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParserFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpResponseParserFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultHttpRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultManagedHttpClientConnection.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultManagedHttpClientConnection.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultManagedHttpClientConnection.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultManagedHttpClientConnection.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultProxyRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultProxyRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultProxyRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultProxyRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultResponseParser.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultResponseParser.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultResponseParser.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultResponseParser.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultSchemePortResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultSchemePortResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultSchemePortResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/DefaultSchemePortResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/IdleConnectionHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/IdleConnectionHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/IdleConnectionHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/IdleConnectionHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/InMemoryDnsResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/InMemoryDnsResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/InMemoryDnsResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/InMemoryDnsResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionInputBuffer.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionInputBuffer.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionInputBuffer.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionInputBuffer.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionOutputBuffer.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionOutputBuffer.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionOutputBuffer.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/LoggingSessionOutputBuffer.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ManagedHttpClientConnectionFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ManagedHttpClientConnectionFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ManagedHttpClientConnectionFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ManagedHttpClientConnectionFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingHttpClientConnectionManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingHttpClientConnectionManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingHttpClientConnectionManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/PoolingHttpClientConnectionManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ProxySelectorRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ProxySelectorRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ProxySelectorRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/ProxySelectorRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SchemeRegistryFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SchemeRegistryFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SchemeRegistryFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SchemeRegistryFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.ConnAdapter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.ConnAdapter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.ConnAdapter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.ConnAdapter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.PoolEntry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.PoolEntry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.PoolEntry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.PoolEntry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SingleClientConnManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultDnsResolver.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultDnsResolver.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultDnsResolver.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultDnsResolver.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultRoutePlanner.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultRoutePlanner.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultRoutePlanner.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/SystemDefaultRoutePlanner.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/Wire.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/Wire.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/Wire.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/class-use/Wire.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/AbstractConnPool.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/AbstractConnPool.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/AbstractConnPool.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/AbstractConnPool.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/PoolEntryRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/PoolEntryRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/PoolEntryRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/PoolEntryRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/RouteSpecificPool.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/RouteSpecificPool.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/RouteSpecificPool.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/RouteSpecificPool.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThread.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThread.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThread.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThread.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/AbstractConnPool.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/AbstractConnPool.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/AbstractConnPool.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/AbstractConnPool.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntry.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntry.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntry.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntry.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntryRef.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntryRef.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntryRef.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPoolEntryRef.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPooledConnAdapter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPooledConnAdapter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPooledConnAdapter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/BasicPooledConnAdapter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ConnPoolByRoute.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ConnPoolByRoute.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ConnPoolByRoute.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ConnPoolByRoute.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/PoolEntryRequest.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/PoolEntryRequest.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/PoolEntryRequest.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/PoolEntryRequest.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/RouteSpecificPool.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/RouteSpecificPool.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/RouteSpecificPool.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/RouteSpecificPool.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ThreadSafeClientConnManager.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ThreadSafeClientConnManager.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ThreadSafeClientConnManager.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/ThreadSafeClientConnManager.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThread.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThread.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThread.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThread.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThreadAborter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThreadAborter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThreadAborter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/class-use/WaitingThreadAborter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/conn/tsccm/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/AbstractCookieSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie2.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie2.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie2.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicClientCookie2.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicCommentHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicCommentHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicCommentHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicCommentHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicDomainHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicDomainHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicDomainHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicDomainHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicExpiresHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicExpiresHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicExpiresHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicExpiresHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicMaxAgeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicMaxAgeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicMaxAgeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicMaxAgeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicPathHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicPathHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicPathHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicPathHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicSecureHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicSecureHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicSecureHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BasicSecureHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BestMatchSpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.SecurityLevel.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.SecurityLevel.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.SecurityLevel.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.SecurityLevel.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatSpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/CookieSpecBase.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/CookieSpecBase.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/CookieSpecBase.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/CookieSpecBase.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateParseException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateParseException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateParseException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateParseException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DateUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.CompatibilityLevel.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.CompatibilityLevel.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.CompatibilityLevel.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.CompatibilityLevel.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/DefaultCookieSpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/IgnoreSpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxExpiresHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxExpiresHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxExpiresHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxExpiresHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxMaxAgeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxMaxAgeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxMaxAgeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/LaxMaxAgeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDomainHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDomainHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDomainHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDomainHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixDomainFilter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixDomainFilter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixDomainFilter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixDomainFilter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixFilter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixFilter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixFilter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixFilter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixListParser.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixListParser.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixListParser.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/PublicSuffixListParser.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109DomainHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109DomainHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109DomainHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109DomainHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109Spec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109Spec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109Spec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109Spec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109SpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109VersionHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109VersionHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109VersionHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2109VersionHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965Spec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965Spec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965Spec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965Spec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965SpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.CompatibilityLevel.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.CompatibilityLevel.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.CompatibilityLevel.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.CompatibilityLevel.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265LaxSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265LaxSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265LaxSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265LaxSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265StrictSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265StrictSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265StrictSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/RFC6265StrictSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/AbstractCookieSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie2.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie2.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie2.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicClientCookie2.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicCommentHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicCommentHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicCommentHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicCommentHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicDomainHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicDomainHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicDomainHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicDomainHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicExpiresHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicExpiresHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicExpiresHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicExpiresHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicMaxAgeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicMaxAgeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicMaxAgeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicMaxAgeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicPathHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicPathHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicPathHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicPathHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicSecureHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicSecureHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicSecureHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BasicSecureHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BestMatchSpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.SecurityLevel.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.SecurityLevel.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.SecurityLevel.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.SecurityLevel.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatSpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatVersionAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatVersionAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatVersionAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/BrowserCompatVersionAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/CookieSpecBase.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/CookieSpecBase.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/CookieSpecBase.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/CookieSpecBase.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateParseException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateParseException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateParseException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateParseException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateUtils.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateUtils.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateUtils.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DateUtils.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.CompatibilityLevel.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.CompatibilityLevel.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.CompatibilityLevel.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.CompatibilityLevel.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/DefaultCookieSpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/IgnoreSpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxExpiresHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxExpiresHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxExpiresHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxExpiresHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxMaxAgeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxMaxAgeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxMaxAgeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/LaxMaxAgeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDomainHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDomainHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDomainHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDomainHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftHeaderParser.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftHeaderParser.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftHeaderParser.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftHeaderParser.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/NetscapeDraftSpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixDomainFilter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixDomainFilter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixDomainFilter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixDomainFilter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixFilter.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixFilter.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixFilter.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixFilter.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixListParser.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixListParser.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixListParser.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/PublicSuffixListParser.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109DomainHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109DomainHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109DomainHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109DomainHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109Spec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109Spec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109Spec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109Spec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109SpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109VersionHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109VersionHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109VersionHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2109VersionHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965CommentUrlAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965CommentUrlAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965CommentUrlAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965CommentUrlAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DiscardAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DiscardAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DiscardAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DiscardAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DomainAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DomainAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DomainAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965DomainAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965PortAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965PortAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965PortAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965PortAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965Spec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965Spec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965Spec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965Spec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965SpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965VersionAttributeHandler.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965VersionAttributeHandler.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965VersionAttributeHandler.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC2965VersionAttributeHandler.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.CompatibilityLevel.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.CompatibilityLevel.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.CompatibilityLevel.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.CompatibilityLevel.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265CookieSpecProvider.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265LaxSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265LaxSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265LaxSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265LaxSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265StrictSpec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265StrictSpec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265StrictSpec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/class-use/RFC6265StrictSpec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/cookie/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/BackoffStrategyExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/BackoffStrategyExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/BackoffStrategyExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/BackoffStrategyExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ClientExecChain.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ClientExecChain.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ClientExecChain.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ClientExecChain.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MainClientExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MainClientExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MainClientExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MainClientExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MinimalClientExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MinimalClientExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MinimalClientExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/MinimalClientExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ProtocolExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ProtocolExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ProtocolExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ProtocolExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RedirectExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RedirectExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RedirectExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RedirectExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RequestAbortedException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RequestAbortedException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RequestAbortedException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RequestAbortedException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RetryExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RetryExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RetryExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/RetryExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/TunnelRefusedException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/TunnelRefusedException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/TunnelRefusedException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/TunnelRefusedException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/BackoffStrategyExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/BackoffStrategyExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/BackoffStrategyExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/BackoffStrategyExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ClientExecChain.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ClientExecChain.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ClientExecChain.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ClientExecChain.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MainClientExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MainClientExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MainClientExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MainClientExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MinimalClientExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MinimalClientExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MinimalClientExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/MinimalClientExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ProtocolExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ProtocolExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ProtocolExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ProtocolExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RedirectExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RedirectExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RedirectExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RedirectExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RequestAbortedException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RequestAbortedException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RequestAbortedException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RequestAbortedException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RetryExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RetryExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RetryExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/RetryExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ServiceUnavailableRetryExec.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ServiceUnavailableRetryExec.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ServiceUnavailableRetryExec.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/ServiceUnavailableRetryExec.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/TunnelRefusedException.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/TunnelRefusedException.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/TunnelRefusedException.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/class-use/TunnelRefusedException.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/impl/execchain/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiClientBuilderFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiClientBuilderFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiClientBuilderFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiClientBuilderFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiProxyConfiguration.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiProxyConfiguration.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiProxyConfiguration.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/OSGiProxyConfiguration.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/HttpProxyConfigurationActivator.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/HttpProxyConfigurationActivator.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/HttpProxyConfigurationActivator.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/HttpProxyConfigurationActivator.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiClientBuilderFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiClientBuilderFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiClientBuilderFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiClientBuilderFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiProxyConfiguration.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiProxyConfiguration.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiProxyConfiguration.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/class-use/OSGiProxyConfiguration.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/impl/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/CachingHttpClientBuilderFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/CachingHttpClientBuilderFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/CachingHttpClientBuilderFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/CachingHttpClientBuilderFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/HttpClientBuilderFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/HttpClientBuilderFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/HttpClientBuilderFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/HttpClientBuilderFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/ProxyConfiguration.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/ProxyConfiguration.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/ProxyConfiguration.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/ProxyConfiguration.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/CachingHttpClientBuilderFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/CachingHttpClientBuilderFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/CachingHttpClientBuilderFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/CachingHttpClientBuilderFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/HttpClientBuilderFactory.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/HttpClientBuilderFactory.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/HttpClientBuilderFactory.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/HttpClientBuilderFactory.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/ProxyConfiguration.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/ProxyConfiguration.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/ProxyConfiguration.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/class-use/ProxyConfiguration.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-use.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-use.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-use.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/org/apache/http/osgi/services/package-use.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-frame.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-frame.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-frame.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-frame.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-summary.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-summary.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-summary.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-summary.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-tree.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-tree.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-tree.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/overview-tree.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/package-list b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/package-list similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/package-list rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/package-list diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/background.gif b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/background.gif similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/background.gif rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/background.gif diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/tab.gif b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/tab.gif similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/tab.gif rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/tab.gif diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar.gif b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar.gif similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar.gif rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar.gif diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar_end.gif b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar_end.gif similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar_end.gif rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/resources/titlebar_end.gif diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/serialized-form.html b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/serialized-form.html similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/serialized-form.html rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/serialized-form.html diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/stylesheet.css b/src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/stylesheet.css similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/stylesheet.css rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/javadoc/stylesheet.css diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/commons-codec-1.11.jar b/src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/commons-codec-1.11.jar similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/commons-codec-1.11.jar rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/commons-codec-1.11.jar diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar b/src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/commons-logging-1.2.jar diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/fluent-hc-4.5.14.jar b/src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/fluent-hc-4.5.14.jar similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/fluent-hc-4.5.14.jar rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/fluent-hc-4.5.14.jar diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-4.5.14.jar b/src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-4.5.14.jar similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-4.5.14.jar rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-4.5.14.jar diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-cache-4.5.14.jar b/src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-cache-4.5.14.jar similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-cache-4.5.14.jar rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-cache-4.5.14.jar diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar b/src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar b/src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar b/src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpmime-4.5.14.jar b/src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpmime-4.5.14.jar similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpmime-4.5.14.jar rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/httpmime-4.5.14.jar diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar b/src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/jna-4.5.2.jar diff --git a/scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar b/src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar similarity index 100% rename from scr/Notes-master1/httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar rename to src/Notes-master1/httpcomponents-client-4.5.14-bin/lib/jna-platform-4.5.2.jar diff --git a/scr/Notes-master1/import-summary.txt b/src/Notes-master1/import-summary.txt similarity index 100% rename from scr/Notes-master1/import-summary.txt rename to src/Notes-master1/import-summary.txt diff --git a/scr/Notes-master1/local.properties b/src/Notes-master1/local.properties similarity index 100% rename from scr/Notes-master1/local.properties rename to src/Notes-master1/local.properties diff --git a/scr/Notes-master1/settings.gradle b/src/Notes-master1/settings.gradle similarity index 100% rename from scr/Notes-master1/settings.gradle rename to src/Notes-master1/settings.gradle