diff --git a/.metadata/.log b/.metadata/.log index 90d92e2..e14a02b 100644 --- a/.metadata/.log +++ b/.metadata/.log @@ -1,10 +1,10 @@ -!SESSION 2016-11-12 15:28:17.844 ----------------------------------------------- -eclipse.buildId=4.6.1.M20160907-1200 -java.version=1.8.0_60 -java.vendor=Oracle Corporation -BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US -Framework arguments: -product org.eclipse.epp.package.java.product -Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.java.product - -!ENTRY org.eclipse.core.net 1 0 2016-11-12 15:28:54.631 -!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences +!SESSION 2016-11-12 15:28:17.844 ----------------------------------------------- +eclipse.buildId=4.6.1.M20160907-1200 +java.version=1.8.0_60 +java.vendor=Oracle Corporation +BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US +Framework arguments: -product org.eclipse.epp.package.java.product +Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.java.product + +!ENTRY org.eclipse.core.net 1 0 2016-11-12 15:28:54.631 +!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs index dffc6b5..77fe583 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -version=1 +eclipse.preferences.version=1 +version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs index 1768a1e..516ee5b 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -1,13 +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|Monaco|11.0|0|COCOA|1|; -proposalOrderMigrated=true -spelling_locale_initialized=true -tabWidthPropagated=true -useAnnotationsPrefPage=true -useQuickDiffPrefPage=true +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|Monaco|11.0|0|COCOA|1|; +proposalOrderMigrated=true +spelling_locale_initialized=true +tabWidthPropagated=true +useAnnotationsPrefPage=true +useQuickDiffPrefPage=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs index 67b1d96..c05c14c 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -org.eclipse.m2e.discovery.pref.projects= +eclipse.preferences.version=1 +org.eclipse.m2e.discovery.pref.projects= diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs index 43e97e4..e5a71f2 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -mylyn.attention.migrated=true +eclipse.preferences.version=1 +mylyn.attention.migrated=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs index 8d462a6..e0b8c16 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true +eclipse.preferences.version=1 +org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs index 2b60c21..46ef804 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -1,5 +1,5 @@ -eclipse.preferences.version=1 -migrated.task.repositories.secure.store=true -org.eclipse.mylyn.tasks.ui.filters.nonmatching=true -org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true -org.eclipse.mylyn.tasks.ui.welcome.message=true +eclipse.preferences.version=1 +migrated.task.repositories.secure.store=true +org.eclipse.mylyn.tasks.ui.filters.nonmatching=true +org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true +org.eclipse.mylyn.tasks.ui.welcome.message=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs index 56cd496..848e263 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -org.eclipse.team.ui.first_time=false +eclipse.preferences.version=1 +org.eclipse.team.ui.first_time=false diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs index 61f3bb8..a6c2629 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -overviewRuler_migration=migrated_3.1 +eclipse.preferences.version=1 +overviewRuler_migration=migrated_3.1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs index 594ac20..7d4bbb2 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs @@ -1,5 +1,5 @@ -PROBLEMS_FILTERS_MIGRATE=true -eclipse.preferences.version=1 -platformState=1478982499589 -quickStart=false -tipsAndTricks=true +PROBLEMS_FILTERS_MIGRATE=true +eclipse.preferences.version=1 +platformState=1478982499589 +quickStart=false +tipsAndTricks=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs index dd77496..bf49ea8 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs @@ -1,3 +1,3 @@ -//org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false -PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery; -eclipse.preferences.version=1 +//org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false +PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery; +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 379cafa..f769a36 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,2385 +1,2385 @@ - - - - activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration - ModelMigrationProcessor.001 - - - - - - - - topLevel - - - - - persp.actionSet:org.eclipse.mylyn.doc.actionSet - persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation - persp.actionSet:org.eclipse.ui.cheatsheets.actionSet - persp.actionSet:org.eclipse.search.searchActionSet - persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo - persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet - persp.actionSet:org.eclipse.ui.actionSet.keyBindings - persp.actionSet:org.eclipse.ui.actionSet.openFiles - persp.actionSet:org.eclipse.debug.ui.launchActionSet - persp.actionSet:org.eclipse.jdt.ui.JavaActionSet - persp.actionSet:org.eclipse.jdt.ui.JavaElementCreationActionSet - persp.actionSet:org.eclipse.ui.NavigateActionSet - persp.viewSC:org.eclipse.jdt.ui.PackageExplorer - persp.viewSC:org.eclipse.jdt.ui.TypeHierarchy - persp.viewSC:org.eclipse.jdt.ui.SourceView - persp.viewSC:org.eclipse.jdt.ui.JavadocView - persp.viewSC:org.eclipse.search.ui.views.SearchView - persp.viewSC:org.eclipse.ui.console.ConsoleView - persp.viewSC:org.eclipse.ui.views.ContentOutline - persp.viewSC:org.eclipse.ui.views.ProblemView - persp.viewSC:org.eclipse.ui.views.ResourceNavigator - persp.viewSC:org.eclipse.ui.views.TaskList - persp.viewSC:org.eclipse.ui.views.ProgressView - persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer - persp.viewSC:org.eclipse.ui.texteditor.TemplatesView - persp.viewSC:org.eclipse.pde.runtime.LogView - persp.newWizSC:org.eclipse.jdt.ui.wizards.JavaProjectWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewPackageCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewClassCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewEnumCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard - persp.newWizSC:org.eclipse.ui.wizards.new.folder - persp.newWizSC:org.eclipse.ui.wizards.new.file - persp.newWizSC:org.eclipse.ui.editors.wizards.UntitledTextFileWizard - persp.perspSC:org.eclipse.jdt.ui.JavaBrowsingPerspective - persp.perspSC:org.eclipse.debug.ui.DebugPerspective - persp.viewSC:org.eclipse.ant.ui.views.AntView - persp.showIn:org.eclipse.egit.ui.RepositoriesView - persp.actionSet:org.eclipse.debug.ui.breakpointActionSet - persp.actionSet:org.eclipse.jdt.debug.ui.JDTDebugActionSet - persp.newWizSC:org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard - persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet - persp.showIn:org.eclipse.jdt.ui.PackageExplorer - persp.showIn:org.eclipse.team.ui.GenericHistoryView - persp.showIn:org.eclipse.ui.views.ResourceNavigator - persp.showIn:org.eclipse.ui.navigator.ProjectExplorer - persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks - persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task - - - - org.eclipse.e4.primaryNavigationStack - active - - - - - - - - - - - - - - - - - - - org.eclipse.e4.secondaryNavigationStack - - - - - - - - org.eclipse.e4.secondaryDataStack - - - - - - - - - - - - - - - - - - - - - - View - categoryTag:Help - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Help - - - - org.eclipse.e4.primaryDataStack - EditorStack - - - - - - - View - categoryTag:Java - active - activeOnClose - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Java - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:General - - - - - View - categoryTag:Ant - - - - - View - categoryTag:Git - - - - - View - categoryTag:Java - - - - - - View - categoryTag:Mylyn - - ViewMenu - menuContribution:menu - - - - - - toolbarSeparator - - - - Draggable - - - - toolbarSeparator - - - - Draggable - - - Draggable - - - Draggable - - - toolbarSeparator - - - - Draggable - - - - toolbarSeparator - - - - toolbarSeparator - - - - Draggable - - - stretch - SHOW_RESTORE_MENU - - - Draggable - HIDEABLE - SHOW_RESTORE_MENU - - - - - stretch - - - Draggable - - - Draggable - - - - - - TrimStack - Draggable - - - - - - - - - - - - - - - - - - - - - - platform:cocoa - - - - - - - platform:cocoa - - - - - platform:cocoa - - - - - - platform:cocoa - - - - - - platform:cocoa - - - - - - platform:cocoa - - - - - - platform:cocoa - - - platform:cocoa - - - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - - - platform:cocoa - - - - - - - - - - platform:cocoa - - - - - - - platform:cocoa - - - - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - - - - - platform:cocoa - - - platform:cocoa - - - - - - - - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - platform:cocoa - - - - - - platform:cocoa - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - - - - - - - - - - platform:cocoa - - - platform:cocoa - - - - - - - - - platform:cocoa - - - - - - - - - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - - platform:cocoa - - - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - - - - platform:cocoa - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - - - - - - - - - - platform:cocoa - - - - - - - - - - - - - - - - platform:cocoa - - - - platform:cocoa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - platform:cocoa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Editor - - - - - View - categoryTag:Ant - - - - - View - categoryTag:Gradle - - - - - View - categoryTag:Gradle - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Git - - - - - View - categoryTag:Git - - - - - View - categoryTag:Git - - - - - View - categoryTag:Git - - - - - View - categoryTag:Git - - - - - View - categoryTag:General - - - - - View - categoryTag:Help - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java - - - - - View - categoryTag:General - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:Maven - - - - - View - categoryTag:Maven - - - - - View - categoryTag:Mylyn - - - - - View - categoryTag:Mylyn - - - - - View - categoryTag:Mylyn - - - - - View - categoryTag:Mylyn - - - - - View - categoryTag:Oomph - - - - - View - categoryTag:Code Recommenders - - - - - View - categoryTag:Code Recommenders - - - - - View - categoryTag:Code Recommenders - - - - - View - categoryTag:Code Recommenders - - - - - View - categoryTag:Code Recommenders - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:Team - - - - - View - categoryTag:Team - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:Help - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:XML - - - - - View - categoryTag:XML - - - - - - - glue - move_after:PerspectiveSpacer - SHOW_RESTORE_MENU - - - move_after:Spacer Glue - HIDEABLE - SHOW_RESTORE_MENU - - - glue - move_after:SearchField - SHOW_RESTORE_MENU - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration + ModelMigrationProcessor.001 + + + + + + + + topLevel + + + + + persp.actionSet:org.eclipse.mylyn.doc.actionSet + persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation + persp.actionSet:org.eclipse.ui.cheatsheets.actionSet + persp.actionSet:org.eclipse.search.searchActionSet + persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation + persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation + persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo + persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet + persp.actionSet:org.eclipse.ui.actionSet.keyBindings + persp.actionSet:org.eclipse.ui.actionSet.openFiles + persp.actionSet:org.eclipse.debug.ui.launchActionSet + persp.actionSet:org.eclipse.jdt.ui.JavaActionSet + persp.actionSet:org.eclipse.jdt.ui.JavaElementCreationActionSet + persp.actionSet:org.eclipse.ui.NavigateActionSet + persp.viewSC:org.eclipse.jdt.ui.PackageExplorer + persp.viewSC:org.eclipse.jdt.ui.TypeHierarchy + persp.viewSC:org.eclipse.jdt.ui.SourceView + persp.viewSC:org.eclipse.jdt.ui.JavadocView + persp.viewSC:org.eclipse.search.ui.views.SearchView + persp.viewSC:org.eclipse.ui.console.ConsoleView + persp.viewSC:org.eclipse.ui.views.ContentOutline + persp.viewSC:org.eclipse.ui.views.ProblemView + persp.viewSC:org.eclipse.ui.views.ResourceNavigator + persp.viewSC:org.eclipse.ui.views.TaskList + persp.viewSC:org.eclipse.ui.views.ProgressView + persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer + persp.viewSC:org.eclipse.ui.texteditor.TemplatesView + persp.viewSC:org.eclipse.pde.runtime.LogView + persp.newWizSC:org.eclipse.jdt.ui.wizards.JavaProjectWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewPackageCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewClassCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewEnumCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard + persp.newWizSC:org.eclipse.ui.wizards.new.folder + persp.newWizSC:org.eclipse.ui.wizards.new.file + persp.newWizSC:org.eclipse.ui.editors.wizards.UntitledTextFileWizard + persp.perspSC:org.eclipse.jdt.ui.JavaBrowsingPerspective + persp.perspSC:org.eclipse.debug.ui.DebugPerspective + persp.viewSC:org.eclipse.ant.ui.views.AntView + persp.showIn:org.eclipse.egit.ui.RepositoriesView + persp.actionSet:org.eclipse.debug.ui.breakpointActionSet + persp.actionSet:org.eclipse.jdt.debug.ui.JDTDebugActionSet + persp.newWizSC:org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard + persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet + persp.showIn:org.eclipse.jdt.ui.PackageExplorer + persp.showIn:org.eclipse.team.ui.GenericHistoryView + persp.showIn:org.eclipse.ui.views.ResourceNavigator + persp.showIn:org.eclipse.ui.navigator.ProjectExplorer + persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks + persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task + + + + org.eclipse.e4.primaryNavigationStack + active + + + + + + + + + + + + + + + + + + + org.eclipse.e4.secondaryNavigationStack + + + + + + + + org.eclipse.e4.secondaryDataStack + + + + + + + + + + + + + + + + + + + + + + View + categoryTag:Help + + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + + + View + categoryTag:Help + + + + org.eclipse.e4.primaryDataStack + EditorStack + + + + + + + View + categoryTag:Java + active + activeOnClose + + ViewMenu + menuContribution:menu + + + + + + + View + categoryTag:Java + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + + + View + categoryTag:Java + + + + + View + categoryTag:Java + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + + + View + categoryTag:General + + + + + View + categoryTag:Ant + + + + + View + categoryTag:Git + + + + + View + categoryTag:Java + + + + + + View + categoryTag:Mylyn + + ViewMenu + menuContribution:menu + + + + + + toolbarSeparator + + + + Draggable + + + + toolbarSeparator + + + + Draggable + + + Draggable + + + Draggable + + + toolbarSeparator + + + + Draggable + + + + toolbarSeparator + + + + toolbarSeparator + + + + Draggable + + + stretch + SHOW_RESTORE_MENU + + + Draggable + HIDEABLE + SHOW_RESTORE_MENU + + + + + stretch + + + Draggable + + + Draggable + + + + + + TrimStack + Draggable + + + + + + + + + + + + + + + + + + + + + + platform:cocoa + + + + + + + platform:cocoa + + + + + platform:cocoa + + + + + + platform:cocoa + + + + + + platform:cocoa + + + + + + platform:cocoa + + + + + + platform:cocoa + + + platform:cocoa + + + + + platform:cocoa + + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + + + + + platform:cocoa + + + + + + + + + + platform:cocoa + + + + + + + platform:cocoa + + + + + + + + + + + platform:cocoa + + + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + + + + + + platform:cocoa + + + platform:cocoa + + + + + + + + + + + + + + + platform:cocoa + + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + + + platform:cocoa + + + + + + platform:cocoa + + + + + + + + platform:cocoa + + + + + platform:cocoa + + + + + + + + + + + + platform:cocoa + + + platform:cocoa + + + + + + + + + platform:cocoa + + + + + + + + + + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + + platform:cocoa + + + + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + + + platform:cocoa + + + platform:cocoa + + + + + + platform:cocoa + + + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + + + + + + platform:cocoa + + + + + platform:cocoa + + + + + + + + + + + + platform:cocoa + + + + + + + + + + + + + + + + platform:cocoa + + + + platform:cocoa + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + platform:cocoa + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Editor + + + + + View + categoryTag:Ant + + + + + View + categoryTag:Gradle + + + + + View + categoryTag:Gradle + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Git + + + + + View + categoryTag:Git + + + + + View + categoryTag:Git + + + + + View + categoryTag:Git + + + + + View + categoryTag:Git + + + + + View + categoryTag:General + + + + + View + categoryTag:Help + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Java + + + + + View + categoryTag:Java + + + + + View + categoryTag:Java + + + + + View + categoryTag:Java Browsing + + + + + View + categoryTag:Java Browsing + + + + + View + categoryTag:Java Browsing + + + + + View + categoryTag:Java Browsing + + + + + View + categoryTag:Java + + + + + View + categoryTag:General + + + + + View + categoryTag:Java + + + + + View + categoryTag:Java + + + + + View + categoryTag:Maven + + + + + View + categoryTag:Maven + + + + + View + categoryTag:Mylyn + + + + + View + categoryTag:Mylyn + + + + + View + categoryTag:Mylyn + + + + + View + categoryTag:Mylyn + + + + + View + categoryTag:Oomph + + + + + View + categoryTag:Code Recommenders + + + + + View + categoryTag:Code Recommenders + + + + + View + categoryTag:Code Recommenders + + + + + View + categoryTag:Code Recommenders + + + + + View + categoryTag:Code Recommenders + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:Team + + + + + View + categoryTag:Team + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:Help + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:XML + + + + + View + categoryTag:XML + + + + + + + glue + move_after:PerspectiveSpacer + SHOW_RESTORE_MENU + + + move_after:Spacer Glue + HIDEABLE + SHOW_RESTORE_MENU + + + glue + move_after:SearchField + SHOW_RESTORE_MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json index 56cef3e..b3453a5 100644 --- a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json +++ b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json @@ -1,70 +1,70 @@ -{ - "version": "v1", - "title": "Eclipse Automated Error Reporting", - "timestamp": 1478982549563, - "ttl": 10080, - "helpUrl": "https://dev.eclipse.org/recommenders/community/aeri/v2/help/", - "feedbackUrl": "http://ctrlflow.com/automated-error-reporting", - "aboutUrl": "https://wiki.eclipse.org/EPP/Logging", - "submitUrl": "https://dev.eclipse.org/recommenders/community/confess/0.6/reports/", - "maxReportSize": 262144, - "problemsUrl": "https://www.eclipse.org/downloads/download.php?r\u003d1\u0026file\u003d/technology/epp/logging/problems.zip", - "problemsTtl": 20160, - "connectTimeout": 10, - "socketTimeout": 10, - "acceptedProducts": [ - "org.eclipse.*", - "org.fordiac.*" - ], - "acceptedPlugins": [ - "org.apache.log4j.*", - "org.eclipse.*", - "org.fordiac.*" - ], - "acceptedPackages": [ - "ch.qos.*", - "com.cforcoding.*", - "com.google.*", - "com.gradleware.tooling.*", - "com.mountainminds.eclemma.*", - "com.naef.*", - "com.sun.*", - "java.*", - "javafx.*", - "javax.*", - "org.apache.*", - "org.eclipse.*", - "org.fordiac.*", - "org.gradle.*", - "org.jacoco.*", - "org.osgi.*", - "org.slf4j.*", - "sun.*" - ], - "requiredPackages": [ - "com.cforcoding.*", - "com.gradleware.tooling.*", - "com.mountainminds.eclemma.*", - "com.naef.*", - "org.eclipse.*", - "org.fordiac.*", - "org.gradle.*", - "org.jacoco.*" - ], - "acceptOtherPackages": true, - "acceptUiFreezes": true, - "ignoredStatuses": [ - ":java.io.IOException:There is not enough space on the disk", - ":java.net.*:", - "org.eclipse.core.filesystem::Could not delete*", - "org.eclipse.core.filesystem::Could not move*", - "org.eclipse.core.runtime::Invalid input url*", - "org.eclipse.epp.mpc.ui:java.io.IOException:", - "org.eclipse.equinox.p2.*::", - "org.eclipse.jface:java.io.IOException:Unable to resolve plug-in*", - "org.eclipse.oomph.setup.core:$org.apache.http.ConnectionClosedException:", - "org.eclipse.pde.core::The current target platform contains errors*", - "org.eclipse.ui::Conflicting handlers for*" - ], - "problemsZipLastDownloadTimestamp": 0 +{ + "version": "v1", + "title": "Eclipse Automated Error Reporting", + "timestamp": 1478982549563, + "ttl": 10080, + "helpUrl": "https://dev.eclipse.org/recommenders/community/aeri/v2/help/", + "feedbackUrl": "http://ctrlflow.com/automated-error-reporting", + "aboutUrl": "https://wiki.eclipse.org/EPP/Logging", + "submitUrl": "https://dev.eclipse.org/recommenders/community/confess/0.6/reports/", + "maxReportSize": 262144, + "problemsUrl": "https://www.eclipse.org/downloads/download.php?r\u003d1\u0026file\u003d/technology/epp/logging/problems.zip", + "problemsTtl": 20160, + "connectTimeout": 10, + "socketTimeout": 10, + "acceptedProducts": [ + "org.eclipse.*", + "org.fordiac.*" + ], + "acceptedPlugins": [ + "org.apache.log4j.*", + "org.eclipse.*", + "org.fordiac.*" + ], + "acceptedPackages": [ + "ch.qos.*", + "com.cforcoding.*", + "com.google.*", + "com.gradleware.tooling.*", + "com.mountainminds.eclemma.*", + "com.naef.*", + "com.sun.*", + "java.*", + "javafx.*", + "javax.*", + "org.apache.*", + "org.eclipse.*", + "org.fordiac.*", + "org.gradle.*", + "org.jacoco.*", + "org.osgi.*", + "org.slf4j.*", + "sun.*" + ], + "requiredPackages": [ + "com.cforcoding.*", + "com.gradleware.tooling.*", + "com.mountainminds.eclemma.*", + "com.naef.*", + "org.eclipse.*", + "org.fordiac.*", + "org.gradle.*", + "org.jacoco.*" + ], + "acceptOtherPackages": true, + "acceptUiFreezes": true, + "ignoredStatuses": [ + ":java.io.IOException:There is not enough space on the disk", + ":java.net.*:", + "org.eclipse.core.filesystem::Could not delete*", + "org.eclipse.core.filesystem::Could not move*", + "org.eclipse.core.runtime::Invalid input url*", + "org.eclipse.epp.mpc.ui:java.io.IOException:", + "org.eclipse.equinox.p2.*::", + "org.eclipse.jface:java.io.IOException:Unable to resolve plug-in*", + "org.eclipse.oomph.setup.core:$org.apache.http.ConnectionClosedException:", + "org.eclipse.pde.core::The current target platform contains errors*", + "org.eclipse.ui::Conflicting handlers for*" + ], + "problemsZipLastDownloadTimestamp": 0 } \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml index a4ee3cb..6cd9562 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml @@ -1,2 +1,2 @@ - - + + diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml index 9e390f5..8c365b7 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml @@ -1,2 +1,2 @@ - - + + diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml index c08c91a..d84bb1d 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml @@ -1,10 +1,10 @@ - -
-
- - - - - -
-
+ +
+
+ + + + + +
+
diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log index 6766dfa..2bbac51 100644 --- a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log +++ b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log @@ -1 +1 @@ -2016-11-12 15:29:07,113 [Worker-2] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache is not available. Remote download required. +2016-11-12 15:29:07,113 [Worker-2] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache is not available. Remote download required. diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.7.0.20160603-1933.xml b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.7.0.20160603-1933.xml index e33758c..aea5414 100644 --- a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.7.0.20160603-1933.xml +++ b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.7.0.20160603-1933.xml @@ -1,43 +1,43 @@ - - - - %date [%thread] %-5level %logger{35} - %msg%n - - - OFF - - - - - ${org.eclipse.m2e.log.dir}/0.log - - ${org.eclipse.m2e.log.dir}/%i.log - 1 - 10 - - - 100MB - - - %date [%thread] %-5level %logger{35} - %msg%n - - - - - - WARN - - - - - - - - - - - - - - - + + + + %date [%thread] %-5level %logger{35} - %msg%n + + + OFF + + + + + ${org.eclipse.m2e.log.dir}/0.log + + ${org.eclipse.m2e.log.dir}/%i.log + 1 + 10 + + + 100MB + + + %date [%thread] %-5level %logger{35} - %msg%n + + + + + + WARN + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup b/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup index 1f73e14..a1ef8f5 100644 --- a/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup +++ b/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup @@ -1,6 +1,6 @@ - - + + diff --git a/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml index f4d0d6c..6d8282b 100644 --- a/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml @@ -1,11 +1,11 @@ - -
-
- - -
-
- - -
-
+ +
+
+ + +
+
+ + +
+
diff --git a/.metadata/.plugins/org.eclipse.ui.intro/introstate b/.metadata/.plugins/org.eclipse.ui.intro/introstate index 236d56c..bc63a5b 100644 --- a/.metadata/.plugins/org.eclipse.ui.intro/introstate +++ b/.metadata/.plugins/org.eclipse.ui.intro/introstate @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml index 851c296..9a8f2a9 100644 --- a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -1,15 +1,15 @@ - -
-
- - - - - - - - - - -
-
+ +
+
+ + + + + + + + + + +
+
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml index e044b18..78ad30b 100644 --- a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -1,4 +1,4 @@ - - - + + + \ No newline at end of file diff --git a/.metadata/version.ini b/.metadata/version.ini index 92fbb79..117e7c8 100644 --- a/.metadata/version.ini +++ b/.metadata/version.ini @@ -1,3 +1,3 @@ -#Sat Nov 12 15:28:50 EST 2016 -org.eclipse.core.runtime=2 -org.eclipse.platform=4.6.1.v20160907-1200 +#Sat Nov 12 15:28:50 EST 2016 +org.eclipse.core.runtime=2 +org.eclipse.platform=4.6.1.v20160907-1200 diff --git a/WebContent/html/javascript/shoppingCart.js b/WebContent/html/javascript/shoppingCart.js index ff47c6a..8a94de3 100644 --- a/WebContent/html/javascript/shoppingCart.js +++ b/WebContent/html/javascript/shoppingCart.js @@ -1,242 +1,242 @@ -//here are all the hardcoded devices - -var dev1 = { - id: 1, - name:"George", - description:"George is probably the coolest iPhone to exist. Ever. Point blank, period.", - hardware:"iPhone", - software:"apple", -}; - -var dev2 = { - id: 2, - name:"Greyson", - description:"Greyson is pretty cool.. I guess.", - hardware:"iPhone", - software:"apple", -}; - -var dev3 = { - id: 3, - name:"Linkin Park", - description:'"The hardest part of ending is starting again."', - hardware:"iPad", - software:"apple", -}; - -var dev4 = { - id: 4, - name:"Abercrombie", - description:"To all the people that hated me in high school, I have the prettiest clothes you all wear now!!", - hardware:"iPad", - software:"apple", -}; - -var dev5 = { - id: 5, - name:"Hulk", - description:"Go ahead and HULK SMASH! this awesome computer stick into your USB.", - hardware:"Computer Stick", - software:"intel", -}; - -var dev6 = { - id: 6, - name:"Captain America", - description:""Make America Great Again." Wait, thats someone else..", - hardware:"Computer Stick", - software:"intel", -}; - -var devices = [dev1, dev2, dev3, dev4, dev5, dev6]; //put them all into an array -var checked = new Array; //this is the array that will indicate whether a shopping cart item is checked off or not - -//adding event listeners to all the options, such as ordering and deleting -document.getElementById('os').addEventListener('click',showPopup); -document.getElementById('ds').addEventListener('click',deleteSelected); -document.getElementById('oa').addEventListener('click',showPopup); -document.getElementById('da').addEventListener('click',deleteAll); - -// Shipping form popup--------------------- -var orderForm = document.getElementById('orderInfoModal'); -var orderFormCloseButton = document.getElementById('closeOrderForm'); -orderFormCloseButton.addEventListener('click',hidePopup); -show(); //on load, we want to show everything - -function getCartItems(){ - var cart = new Array; //initiate array for them - var cart_str = localStorage.getItem('cart'); //get them from local storage - if (cart_str !== null) { //if there is at least one object already we need to convert it from JSON to string - cart = JSON.parse(cart_str); - } - return cart; //return value is an array -} - -/** -This function displays a list of devices that a user has currently in their shopping cart. -**/ -function show(){ - var cart = getCartItems(); //get all the cart items you want to show - var html = ''; //html string initially empty - var part1 = "nhpup.popup('"; - var part2 = "');" - if(cart.length !== 0){ //only continue if there are cart items - html += '

Tickets have been generated below based on your desired selections.


' - for(var i = 0; i < cart.length; i++){ //iterate cart - var id = cart[i]; //this gets the id value from the cart - for(var j = 0; j < devices.length; j++){ //iterate device list - if(devices[j].id === id){ //match the id's "nhpup.popup(' ');" - html += ''; //create listing of all the devices - break; //break out of loop when we match - } - } - } - } - else{ //no point in doing all that computing if the list is empty - html += 'Shopping cart is empty.'; //so give a nice error message. - } - - document.getElementById('shoppingContainer').innerHTML = html; //adds what we just generated to the webpage - - var checkboxes = document.getElementsByClassName('deviceCheckbox'); //get all the checkboxes we just placed! - for(var i = 0; i < checkboxes.length; i++){ //iterate them - checkboxes[i].addEventListener('click',changeStatus); //when we click on a checkbox, it should add/remove the id from the selected array - } - - var tickets = document.getElementsByClassName('ticket'); - for(var i = 0; i < tickets.length; i++){ - tickets[i].addEventListener('click',clickTicket); - } -} - -/** -This allows a ticket click to do the same thing as clicking on the checkbox. -**/ -function clickTicket(){ - var checkboxes = document.getElementsByClassName('deviceCheckbox'); - var id = this.getAttribute('id'); - id = parseInt(id.replace(/[^0-9\.]/g,''),10); - if(document.getElementById(id).checked == true){ - document.getElementById(id).checked = false; - for(var i = 0; i < checked.length; i++){ //iterate checked array - if(id == checked[i]) //find the right checkbox - checked.splice(i,1); //remove from the array - } - } - else{ - document.getElementById(id).checked = true; - checked.push(id); - } -} - -/** -When a checkbox is clicked, either a device needs to be checked or unchecked in the shopping cart. This function handles JUST that. -**/ -function changeStatus(){ - var id = this.getAttribute('id'); //get the checkbox's id - if(this.checked == true){ //we just checked it off - checked.push(id); //add item to the selected list - } - else{ //we just unchecked it - for(var i = 0; i < checked.length; i++){ //iterate checked array - if(id == checked[i]) //find the right checkbox - checked.splice(i,1); //remove from the array - } - } -} - -/** -This function takes all the devices we selected and simulates an order on them. -**/ -function showPopup(){ - orderForm.style.display = "block"; -} -function hidePopup(){ - orderForm.style.display = "none"; -} - -function orderSelected(){ - var response = confirm("Are you sure you'd like to order the selected items?"); - if(response == true){ //if they confirm - for(var i = 0; i < checked.length; i++){ //iterate all the checked off devices - var id = checked[i]; //get the id of each device - var requested = getRequestedItems(); //get the unavailable items - var cart = getCartItems(); //get the cart - requested.push(id); //add to unavailable list - for(var j = 0; j < cart.length; j++){ //iterate cart - if(cart[j] == id) //match id's - cart.splice(j,1); //remove from the cart - } - localStorage.setItem('requested', JSON.stringify(requested)); //update local storage - localStorage.setItem('cart', JSON.stringify(cart)); //update local storage - } - checked = new Array; //reset the checked off array - show(); //reload the container - } -} - -/** -This function takes all the devices we selected and removes them from the shopping cart. -**/ -function deleteSelected(){ - var response = confirm("Are you sure you'd like to remove the selected items from the cart?"); - if(response == true){ //if they confirm - for(var i = 0; i < checked.length; i++){ //iterate all the checked off devices - var id = checked[i]; //get the id of each device - var cart = getCartItems(); //get the cart - for(var j = 0; j < cart.length; j++){ //iterate cart - if(cart[j] == id){ //match ids - cart.splice(j,1); //remove from the cart - } - } - localStorage.setItem('cart', JSON.stringify(cart)); //update local storage - } - checked = new Array; //reset the checked array - show(); //reload the container - } -} - -/** -This function takes all devices in the shopping cart and orders them. -**/ -function orderAll(){ - var response = confirm("Are you sure you'd like to order the selected items?"); - if(response == true){ //if they confirm - var cart = getCartItems(); //get the cart - for(var i = 0; i < cart.length; i++){ //iterate the cart - var id = cart[i]; //get the id of each device - var requested = getRequestedItems(); //get the unavailable items - requested.push(id); //add to unavailable list - localStorage.setItem('requested', JSON.stringify(requested)); //update local storage - } - checked = new Array; //reset the checked off array - cart = new Array; //cart should now be empty, so reset also - localStorage.setItem('cart',JSON.stringify(cart)); //update local storage - show(); //reload container - } -} - -/** -This function takes all devices in the shopping cart and deletes them. -**/ -function deleteAll(){ - var response = confirm("Are you sure you'd like to order the selected items?"); - if(response == true){ //if they confirm - cart = new Array; //empty cart - localStorage.setItem('cart',JSON.stringify(cart)); //update local storage - checked = new Array; //reset the checked off array - show(); //reload container - } -} - -/** -This function gets requested items from local storage. -**/ -function getRequestedItems(){ - var requested = new Array; //make new array - var requested_str = localStorage.getItem('requested'); //get the string from local storage - if(requested_str !== '' && requested_str !== null){ //as long as its not null - requested = JSON.parse(requested_str); //make into array - } - return requested; //return value is an array +//here are all the hardcoded devices + +var dev1 = { + id: 1, + name:"George", + description:"George is probably the coolest iPhone to exist. Ever. Point blank, period.", + hardware:"iPhone", + software:"apple", +}; + +var dev2 = { + id: 2, + name:"Greyson", + description:"Greyson is pretty cool.. I guess.", + hardware:"iPhone", + software:"apple", +}; + +var dev3 = { + id: 3, + name:"Linkin Park", + description:'"The hardest part of ending is starting again."', + hardware:"iPad", + software:"apple", +}; + +var dev4 = { + id: 4, + name:"Abercrombie", + description:"To all the people that hated me in high school, I have the prettiest clothes you all wear now!!", + hardware:"iPad", + software:"apple", +}; + +var dev5 = { + id: 5, + name:"Hulk", + description:"Go ahead and HULK SMASH! this awesome computer stick into your USB.", + hardware:"Computer Stick", + software:"intel", +}; + +var dev6 = { + id: 6, + name:"Captain America", + description:""Make America Great Again." Wait, thats someone else..", + hardware:"Computer Stick", + software:"intel", +}; + +var devices = [dev1, dev2, dev3, dev4, dev5, dev6]; //put them all into an array +var checked = new Array; //this is the array that will indicate whether a shopping cart item is checked off or not + +//adding event listeners to all the options, such as ordering and deleting +document.getElementById('os').addEventListener('click',showPopup); +document.getElementById('ds').addEventListener('click',deleteSelected); +document.getElementById('oa').addEventListener('click',showPopup); +document.getElementById('da').addEventListener('click',deleteAll); + +// Shipping form popup--------------------- +var orderForm = document.getElementById('orderInfoModal'); +var orderFormCloseButton = document.getElementById('closeOrderForm'); +orderFormCloseButton.addEventListener('click',hidePopup); +show(); //on load, we want to show everything + +function getCartItems(){ + var cart = new Array; //initiate array for them + var cart_str = localStorage.getItem('cart'); //get them from local storage + if (cart_str !== null) { //if there is at least one object already we need to convert it from JSON to string + cart = JSON.parse(cart_str); + } + return cart; //return value is an array +} + +/** +This function displays a list of devices that a user has currently in their shopping cart. +**/ +function show(){ + var cart = getCartItems(); //get all the cart items you want to show + var html = ''; //html string initially empty + var part1 = "nhpup.popup('"; + var part2 = "');" + if(cart.length !== 0){ //only continue if there are cart items + html += '

Tickets have been generated below based on your desired selections.


' + for(var i = 0; i < cart.length; i++){ //iterate cart + var id = cart[i]; //this gets the id value from the cart + for(var j = 0; j < devices.length; j++){ //iterate device list + if(devices[j].id === id){ //match the id's "nhpup.popup(' ');" + html += ''; //create listing of all the devices + break; //break out of loop when we match + } + } + } + } + else{ //no point in doing all that computing if the list is empty + html += 'Shopping cart is empty.'; //so give a nice error message. + } + + document.getElementById('shoppingContainer').innerHTML = html; //adds what we just generated to the webpage + + var checkboxes = document.getElementsByClassName('deviceCheckbox'); //get all the checkboxes we just placed! + for(var i = 0; i < checkboxes.length; i++){ //iterate them + checkboxes[i].addEventListener('click',changeStatus); //when we click on a checkbox, it should add/remove the id from the selected array + } + + var tickets = document.getElementsByClassName('ticket'); + for(var i = 0; i < tickets.length; i++){ + tickets[i].addEventListener('click',clickTicket); + } +} + +/** +This allows a ticket click to do the same thing as clicking on the checkbox. +**/ +function clickTicket(){ + var checkboxes = document.getElementsByClassName('deviceCheckbox'); + var id = this.getAttribute('id'); + id = parseInt(id.replace(/[^0-9\.]/g,''),10); + if(document.getElementById(id).checked == true){ + document.getElementById(id).checked = false; + for(var i = 0; i < checked.length; i++){ //iterate checked array + if(id == checked[i]) //find the right checkbox + checked.splice(i,1); //remove from the array + } + } + else{ + document.getElementById(id).checked = true; + checked.push(id); + } +} + +/** +When a checkbox is clicked, either a device needs to be checked or unchecked in the shopping cart. This function handles JUST that. +**/ +function changeStatus(){ + var id = this.getAttribute('id'); //get the checkbox's id + if(this.checked == true){ //we just checked it off + checked.push(id); //add item to the selected list + } + else{ //we just unchecked it + for(var i = 0; i < checked.length; i++){ //iterate checked array + if(id == checked[i]) //find the right checkbox + checked.splice(i,1); //remove from the array + } + } +} + +/** +This function takes all the devices we selected and simulates an order on them. +**/ +function showPopup(){ + orderForm.style.display = "block"; +} +function hidePopup(){ + orderForm.style.display = "none"; +} + +function orderSelected(){ + var response = confirm("Are you sure you'd like to order the selected items?"); + if(response == true){ //if they confirm + for(var i = 0; i < checked.length; i++){ //iterate all the checked off devices + var id = checked[i]; //get the id of each device + var requested = getRequestedItems(); //get the unavailable items + var cart = getCartItems(); //get the cart + requested.push(id); //add to unavailable list + for(var j = 0; j < cart.length; j++){ //iterate cart + if(cart[j] == id) //match id's + cart.splice(j,1); //remove from the cart + } + localStorage.setItem('requested', JSON.stringify(requested)); //update local storage + localStorage.setItem('cart', JSON.stringify(cart)); //update local storage + } + checked = new Array; //reset the checked off array + show(); //reload the container + } +} + +/** +This function takes all the devices we selected and removes them from the shopping cart. +**/ +function deleteSelected(){ + var response = confirm("Are you sure you'd like to remove the selected items from the cart?"); + if(response == true){ //if they confirm + for(var i = 0; i < checked.length; i++){ //iterate all the checked off devices + var id = checked[i]; //get the id of each device + var cart = getCartItems(); //get the cart + for(var j = 0; j < cart.length; j++){ //iterate cart + if(cart[j] == id){ //match ids + cart.splice(j,1); //remove from the cart + } + } + localStorage.setItem('cart', JSON.stringify(cart)); //update local storage + } + checked = new Array; //reset the checked array + show(); //reload the container + } +} + +/** +This function takes all devices in the shopping cart and orders them. +**/ +function orderAll(){ + var response = confirm("Are you sure you'd like to order the selected items?"); + if(response == true){ //if they confirm + var cart = getCartItems(); //get the cart + for(var i = 0; i < cart.length; i++){ //iterate the cart + var id = cart[i]; //get the id of each device + var requested = getRequestedItems(); //get the unavailable items + requested.push(id); //add to unavailable list + localStorage.setItem('requested', JSON.stringify(requested)); //update local storage + } + checked = new Array; //reset the checked off array + cart = new Array; //cart should now be empty, so reset also + localStorage.setItem('cart',JSON.stringify(cart)); //update local storage + show(); //reload container + } +} + +/** +This function takes all devices in the shopping cart and deletes them. +**/ +function deleteAll(){ + var response = confirm("Are you sure you'd like to order the selected items?"); + if(response == true){ //if they confirm + cart = new Array; //empty cart + localStorage.setItem('cart',JSON.stringify(cart)); //update local storage + checked = new Array; //reset the checked off array + show(); //reload container + } +} + +/** +This function gets requested items from local storage. +**/ +function getRequestedItems(){ + var requested = new Array; //make new array + var requested_str = localStorage.getItem('requested'); //get the string from local storage + if(requested_str !== '' && requested_str !== null){ //as long as its not null + requested = JSON.parse(requested_str); //make into array + } + return requested; //return value is an array } \ No newline at end of file diff --git a/WebContent/html/webpages/index.html b/WebContent/html/webpages/index.html index 3993eb2..5f5a100 100644 --- a/WebContent/html/webpages/index.html +++ b/WebContent/html/webpages/index.html @@ -1,82 +1,82 @@ - - - - - - - - - - Synchrony Financial - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + Synchrony Financial + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/html/webpages/listingPage.jsp b/WebContent/html/webpages/listingPage.jsp index d2f6067..a5b1633 100644 --- a/WebContent/html/webpages/listingPage.jsp +++ b/WebContent/html/webpages/listingPage.jsp @@ -1,79 +1,79 @@ - - - - - - - - - - - Synchrony Financial - - - - - - - - - - - - - -
-

Device Dictionary

-
-
- - <%@ include file="../javascript/listing.jsp" %> - - + + + + + + + + + + + Synchrony Financial + + + + + + + + + + + + + +
+

Device Dictionary

+
+
+ + <%@ include file="../javascript/listing.jsp" %> + + \ No newline at end of file diff --git a/WebContent/html/webpages/map.html b/WebContent/html/webpages/map.html index 5256954..09d9fec 100644 --- a/WebContent/html/webpages/map.html +++ b/WebContent/html/webpages/map.html @@ -1,89 +1,89 @@ - - - - - - - - - - Synchrony Financial - - - - - - - - - - - - - - - -

Our Wonderful Synchrony Financial Map!

- -
- - - - - - + + + + + + + + + + Synchrony Financial + + + + + + + + + + + + + + + +

Our Wonderful Synchrony Financial Map!

+ +
+ + + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/shoppingCart.html b/WebContent/html/webpages/shoppingCart.html index a2768b4..888fce9 100644 --- a/WebContent/html/webpages/shoppingCart.html +++ b/WebContent/html/webpages/shoppingCart.html @@ -1,90 +1,90 @@ - - - - - - - - - - Synchrony Financial - - - - - - - - - - - - - - - - -
-

Welcome to your shopping cart!

-
-
-
- - - - - - + + + + + + + + + + Synchrony Financial + + + + + + + + + + + + + + + + +
+

Welcome to your shopping cart!

+
+
+
+ + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml deleted file mode 100644 index c89420d..0000000 --- a/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - 4.0.0 - 2017-CSE-Senior-Project-Team-2 - 2017-CSE-Senior-Project-Team-2 - 0.0.1-SNAPSHOT - - src - - - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - maven-war-plugin - 3.0.0 - - WebContent - - - - - - - mysql - mysql-connector-java - 5.1.40 - - - war - \ No newline at end of file