forked from CSE2102Fall2015/2015JAT
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge remote-tracking branch 'origin/master' into John's-Branch
- Loading branch information
Showing
23 changed files
with
2,636 additions
and
2 deletions.
There are no files selected for viewing
Empty file.
Large diffs are not rendered by default.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
Binary file added
BIN
+57 Bytes
.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
Binary file not shown.
1 change: 1 addition & 0 deletions
1
.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
Binary file not shown.
Binary file added
BIN
+358 Bytes
.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
Binary file not shown.
2 changes: 2 additions & 0 deletions
2
.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| eclipse.preferences.version=1 | ||
| version=1 |
13 changes: 13 additions & 0 deletions
13
.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| content_assist_proposals_background=255,255,255 | ||
| content_assist_proposals_foreground=0,0,0 | ||
| eclipse.preferences.version=1 | ||
| fontPropagated=true | ||
| org.eclipse.jdt.ui.editor.tab.width= | ||
| org.eclipse.jdt.ui.formatterprofiles.version=12 | ||
| org.eclipse.jdt.ui.javadoclocations.migrated=true | ||
| org.eclipse.jface.textfont=1|Consolas|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas; | ||
| proposalOrderMigrated=true | ||
| spelling_locale_initialized=true | ||
| tabWidthPropagated=true | ||
| useAnnotationsPrefPage=true | ||
| useQuickDiffPrefPage=true |
5 changes: 5 additions & 0 deletions
5
.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| PROBLEMS_FILTERS_MIGRATE=true | ||
| eclipse.preferences.version=1 | ||
| platformState=1421081270101 | ||
| quickStart=false | ||
| tipsAndTricks=true |
2 changes: 2 additions & 0 deletions
2
.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| eclipse.preferences.version=1 | ||
| showIntro=false |
2,044 changes: 2,044 additions & 0 deletions
2,044
.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <typeInfoHistroy/> |
2 changes: 2 additions & 0 deletions
2
.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <qualifiedTypeNameHistroy/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <section name="Workbench"> | ||
| <section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart"> | ||
| <item value="2" key="layout"/> | ||
| <item value="true" key="group_libraries"/> | ||
| <item value="<?xml version="1.0" encoding="UTF-8"?>
<packageExplorer group_libraries="1" layout="2" linkWithEditor="0" rootMode="1" workingSetName="Aggregate for window 1447894638380">
<customFilters userDefinedPatternsEnabled="false">
<xmlDefinedFilters>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.StaticsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.pde.ui.BinaryProjectFilter1" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter" isEnabled="false"/>
<child filterId="org.eclipse.pde.ui.ExternalPluginLibrariesFilter1" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.FieldsFilter" isEnabled="false"/>
</xmlDefinedFilters>
</customFilters>
</packageExplorer>" key="memento"/> | ||
| <item value="1" key="rootMode"/> | ||
| <item value="false" key="linkWithEditor"/> | ||
| </section> | ||
| </section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <section name="Workbench"> | ||
| <section name="WORKBENCH_SETTINGS"> | ||
| <list key="ENABLED_TRANSFERS"> | ||
| </list> | ||
| </section> | ||
| <section name="ChooseWorkspaceDialogSettings"> | ||
| <item value="202" key="DIALOG_X_ORIGIN"/> | ||
| <item value="197" key="DIALOG_Y_ORIGIN"/> | ||
| </section> | ||
| </section> |
15 changes: 15 additions & 0 deletions
15
.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <section name="Workbench"> | ||
| <section name="org.eclipse.ui.internal.QuickAccess"> | ||
| <item value="760" key="dialogHeight"/> | ||
| <item value="1440" key="dialogWidth"/> | ||
| <list key="textEntries"> | ||
| </list> | ||
| <list key="orderedElements"> | ||
| </list> | ||
| <list key="orderedProviders"> | ||
| </list> | ||
| <list key="textArray"> | ||
| </list> | ||
| </section> | ||
| </section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <workingSetManager> | ||
| <workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1447894638380_0" label="Window Working Set" name="Aggregate for window 1447894638380"/> | ||
| </workingSetManager> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| org.eclipse.core.runtime=1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters