Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-02-02 08:14:08 -0500
committerUwe Stieber2012-02-02 08:15:03 -0500
commit71fa882e578db5b41d3fa88ace75c5741bd853ea (patch)
tree6c2277be57ab08ed90229428f1a051d772838fd1 /target_explorer
parentdb2934ac51b6c74d4c24470dd8fdbc48fe9f1ea3 (diff)
downloadorg.eclipse.tcf-71fa882e578db5b41d3fa88ace75c5741bd853ea.tar.gz
org.eclipse.tcf-71fa882e578db5b41d3fa88ace75c5741bd853ea.tar.xz
org.eclipse.tcf-71fa882e578db5b41d3fa88ace75c5741bd853ea.zip
Target Explorer: Split out working set support
Diffstat (limited to 'target_explorer')
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.feature/feature.xml7
-rw-r--r--target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml7
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF17
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.classpath7
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.options1
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.project28
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.settings/org.eclipse.jdt.core.prefs362
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/META-INF/MANIFEST.MF16
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/build.properties7
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/icons/obj16/workingset.gif (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/icons/obj16/workingset.gif)bin943 -> 943 bytes
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/icons/obj16/workingsets.gif (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/icons/obj16/workingsets.gif)bin333 -> 333 bytes
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/plugin.properties60
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/plugin.xml113
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/pom.xml17
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparator.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparator.java)0
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparatorFactory.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparatorFactory.java)0
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/OthersWorkingSetElementUpdater.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/OthersWorkingSetElementUpdater.java)4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementAdapter.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementAdapter.java)0
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolder.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolder.java)0
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderAdapterFactory.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderAdapterFactory.java)0
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderFactory.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderFactory.java)0
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementUpdater.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementUpdater.java)0
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetFilter.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetFilter.java)0
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewStateManager.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewStateManager.java)4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewerSorter.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewerSorter.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsContentProvider.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsContentProvider.java)36
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsLabelProvider.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsLabelProvider.java)0
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/actions/ConfigureWorkingSetAction.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/actions/ConfigureWorkingSetAction.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionGroup.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionGroup.java)11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionProvider.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionProvider.java)0
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/activator/UIPlugin.java119
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/dialogs/WorkingSetConfigurationDialog.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/dialogs/WorkingSetConfigurationDialog.java)2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/interfaces/ImageConsts.java54
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/internal/adapters/AdapterFactory.java58
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/nls/Messages.java67
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/nls/Messages.properties64
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/pages/AbstractWorkingSetWizardPage.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/pages/AbstractWorkingSetWizardPage.java)4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/pages/TargetWorkingSetPage.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/pages/TargetWorkingSetPage.java)10
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF8
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml96
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/interfaces/ImageConsts.java10
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/internal/View.java81
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/nls/Messages.java41
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/nls/Messages.properties45
46 files changed, 1052 insertions, 324 deletions
diff --git a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
index b0232ea84..2eb05fcb9 100644
--- a/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.feature/feature.xml
@@ -163,4 +163,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.tcf.te.ui.views.workingsets"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
index eacf02cb1..2c0ae3815 100644
--- a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/feature.xml
@@ -147,4 +147,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.tcf.te.ui.views.workingsets.source"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF
index 4e47107cf..0e9e406e2 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF
@@ -14,3 +14,20 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
+Export-Package: org.eclipse.tcf.te.launch.core.activator;x-internal:=true,
+ org.eclipse.tcf.te.launch.core.adapters.internal;x-internal:=true,
+ org.eclipse.tcf.te.launch.core.bindings,
+ org.eclipse.tcf.te.launch.core.bindings.interfaces,
+ org.eclipse.tcf.te.launch.core.bindings.internal;x-internal:=true,
+ org.eclipse.tcf.te.launch.core.exceptions,
+ org.eclipse.tcf.te.launch.core.extensions.internal;x-internal:=true,
+ org.eclipse.tcf.te.launch.core.interfaces.tracing,
+ org.eclipse.tcf.te.launch.core.lm,
+ org.eclipse.tcf.te.launch.core.lm.delegates,
+ org.eclipse.tcf.te.launch.core.lm.interfaces,
+ org.eclipse.tcf.te.launch.core.lm.internal;x-internal:=true,
+ org.eclipse.tcf.te.launch.core.nls;x-internal:=true,
+ org.eclipse.tcf.te.launch.core.persistence,
+ org.eclipse.tcf.te.launch.core.preferences,
+ org.eclipse.tcf.te.launch.core.selection,
+ org.eclipse.tcf.te.launch.core.selection.interfaces
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.classpath b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.classpath
new file mode 100644
index 000000000..8a8f1668c
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.options b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.options
new file mode 100644
index 000000000..f9d23c944
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.options
@@ -0,0 +1 @@
+org.eclipse.tcf.te.ui.views.workingsets/debugmode = 0
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.project b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.project
new file mode 100644
index 000000000..fd7f459d8
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.tcf.te.ui.views.workingsets</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.settings/org.eclipse.jdt.core.prefs b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..37e98db4c
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,362 @@
+#Thu Feb 02 11:07:44 CET 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=100
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=4
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=4
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=true
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=true
+org.eclipse.jdt.core.formatter.lineSplit=100
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.settings/org.eclipse.jdt.ui.prefs b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..5179b21dc
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,4 @@
+#Thu Feb 02 11:07:44 CET 2012
+eclipse.preferences.version=1
+formatter_profile=_Target Explorer Java STD
+formatter_settings_version=12
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..86186d603
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.tcf.te.ui.views.workingsets;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.tcf.te.ui.views.workingsets.activator.UIPlugin
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.ui.navigator;bundle-version="3.5.100",
+ org.eclipse.tcf.te.runtime;bundle-version="1.0.0",
+ org.eclipse.tcf.te.ui;bundle-version="1.0.0",
+ org.eclipse.tcf.te.ui.views;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/build.properties b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/build.properties
new file mode 100644
index 000000000..e0b53196d
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.properties,\
+ icons/,\
+ plugin.xml
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/icons/obj16/workingset.gif b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/icons/obj16/workingset.gif
index d46c5370d..d46c5370d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/icons/obj16/workingset.gif
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/icons/obj16/workingset.gif
Binary files differ
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/icons/obj16/workingsets.gif b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/icons/obj16/workingsets.gif
index fa8c9f758..fa8c9f758 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/icons/obj16/workingsets.gif
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/icons/obj16/workingsets.gif
Binary files differ
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/plugin.properties
new file mode 100644
index 000000000..fa8ea79e7
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/plugin.properties
@@ -0,0 +1,60 @@
+##################################################################################
+# Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+# This program and the accompanying materials are made available under the terms
+# of the Eclipse Public License v1.0 which accompanies this distribution, and is
+# available at http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Wind River Systems - initial API and implementation
+##################################################################################
+
+pluginName = Target Explorer View
+providerName = Eclipse.org - TCF
+
+# ***** Extension Points *****
+
+ExtensionPoint.editorPages.name=Target Explorer Details Editor Pages Extension Point
+ExtensionPoint.editorPageBindings.name=Target Explorer Details Editor Page Bindings Extension Point
+
+# ***** Perspective *****
+
+Perspective.name=Target Explorer
+
+# ***** Views *****
+
+ViewCategory.name=Target Explorer Views
+View.name=Target Explorer
+
+# ***** Editor *****
+
+Editor.name=Target Explorer Details Editor
+
+# ***** Common Navigator *****
+
+filters.workingSet.name=Working sets [not visible in UI]
+filters.workingSet.description=Hides unselected working sets [not visible in UI]
+
+workingsets.extension.name=Working Sets
+
+workingset.name=Target Explorer
+workingset.description=Target Explorer working sets.
+
+workingset.others.name=Other
+workingset.others.description=Working set containing all elements not in any group.
+
+# ***** Command and menu contributions *****
+command.open.name=Open
+
+command.properties.label=Properties
+command.properties.tooltip=Show Properties of Selection
+
+menu.showIn.label = Show In
+menu.properties.label = Properties
+
+command.showInProperties.label = Show In Properties
+
+command.refresh.label=Refresh
+command.refresh.description=Refresh the selected node
+
+command.delete.label=Delete
+command.delete.description=Delete the selected node
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/plugin.xml
new file mode 100644
index 000000000..6dd584c4d
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/plugin.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+<!-- Adapter factory contributions -->
+ <extension point="org.eclipse.core.runtime.adapters">
+ <factory
+ adaptableType="org.eclipse.tcf.te.ui.views.internal.View"
+ class="org.eclipse.tcf.te.ui.views.workingsets.internal.adapters.AdapterFactory">
+ <adapter type="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetViewStateManager"/>
+ </factory>
+
+ <factory
+ adaptableType="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolder"
+ class="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolderAdapterFactory">
+ <adapter type="org.eclipse.tcf.te.runtime.interfaces.workingsets.IWorkingSetElement"/>
+ </factory>
+ </extension>
+
+<!-- Working Sets navigator action contributions -->
+ <extension point="org.eclipse.ui.navigator.navigatorContent">
+ <actionProvider
+ class="org.eclipse.tcf.te.ui.views.workingsets.actions.WorkingSetActionProvider"
+ id="org.eclipse.tcf.te.ui.views.navigator.actions.WorkingSetActions">
+ <enablement>
+ <or>
+ <adapt type="java.lang.Object" />
+ <adapt type="java.util.Collection">
+ <count value="0" />
+ </adapt>
+ </or>
+ </enablement>
+ </actionProvider>
+ </extension>
+
+<!-- Working Sets navigator content contributions -->
+ <extension point="org.eclipse.ui.navigator.navigatorContent">
+ <commonFilter
+ id="org.eclipse.tcf.te.ui.views.navigator.filters.workingSet"
+ name="%filters.workingSet.name"
+ description="%filters.workingSet.description"
+ class="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetFilter"
+ activeByDefault="false"
+ visibleInUI="false">
+ </commonFilter>
+
+ <navigatorContent
+ activeByDefault="true"
+ contentProvider="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetsContentProvider"
+ icon="icons/obj16/workingsets.gif"
+ id="org.eclipse.tcf.te.ui.views.navigator.content.workingSets"
+ labelProvider="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetsLabelProvider"
+ name="%workingsets.extension.name"
+ priority="higher">
+ <triggerPoints>
+ <or>
+ <instanceof value="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetViewStateManager"/>
+ <instanceof value="org.eclipse.ui.IWorkingSet"/>
+ <instanceof value="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolder"/>
+ </or>
+ </triggerPoints>
+ <possibleChildren>
+ <or>
+ <instanceof value="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetViewStateManager"/>
+ <instanceof value="org.eclipse.ui.IWorkingSet"/>
+ <instanceof value="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolder"/>
+ <instanceof
+ value="org.eclipse.tcf.te.runtime.interfaces.workingsets.IWorkingSetElement">
+ </instanceof>
+ </or>
+ </possibleChildren>
+ <commonSorter
+ class="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetViewerSorter"
+ id="org.eclipse.tcf.te.ui.views.navigator.content.workingSets.sorter">
+ </commonSorter>
+ </navigatorContent>
+
+ </extension>
+
+<!-- Working Set contributions -->
+ <extension point="org.eclipse.ui.workingSets">
+ <workingSet
+ description="%workingset.description"
+ elementAdapterClass="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementAdapter"
+ icon="icons/obj16/workingset.gif"
+ id="org.eclipse.tcf.te.ui.views.workingset"
+ name="%workingset.name"
+ pageClass="org.eclipse.tcf.te.ui.views.workingsets.pages.TargetWorkingSetPage"
+ updaterClass="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementUpdater">
+ </workingSet>
+
+ <workingSet
+ description="%workingset.others.description"
+ icon="icons/obj16/workingset.gif"
+ id="org.eclipse.tcf.te.ui.views.workingset.others"
+ name="%workingset.others.name"
+ updaterClass="org.eclipse.tcf.te.ui.views.workingsets.OthersWorkingSetElementUpdater">
+ </workingSet>
+ </extension>
+
+<!-- Element factories -->
+ <extension point="org.eclipse.ui.elementFactories">
+ <factory
+ class="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolderFactory"
+ id="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolderFactory">
+ </factory>
+ <factory
+ class="org.eclipse.tcf.te.ui.views.workingsets.CustomizedOrderComparatorFactory"
+ id="org.eclipse.tcf.te.ui.views.workingsets.CustomizedOrderComparatorFactory">
+ </factory>
+ </extension>
+
+</plugin>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/pom.xml b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/pom.xml
new file mode 100644
index 000000000..7e5a3a059
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.tcf</groupId>
+ <artifactId>tcf-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+
+ <version>1.0.0.qualifier</version>
+ <artifactId>org.eclipse.tcf.te.ui.views.workingsets</artifactId>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparator.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparator.java
index 13ed9becd..13ed9becd 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparator.java
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparatorFactory.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparatorFactory.java
index 44ebd62fc..44ebd62fc 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparatorFactory.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/CustomizedOrderComparatorFactory.java
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/OthersWorkingSetElementUpdater.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/OthersWorkingSetElementUpdater.java
index 319d8d178..e45fdf75c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/OthersWorkingSetElementUpdater.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/OthersWorkingSetElementUpdater.java
@@ -14,8 +14,8 @@ import java.util.List;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.tcf.te.runtime.interfaces.workingsets.IWorkingSetElement;
-import org.eclipse.tcf.te.ui.views.internal.View;
import org.eclipse.tcf.te.ui.views.internal.ViewRoot;
import org.eclipse.tcf.te.ui.views.internal.ViewViewer;
import org.eclipse.ui.IWorkingSet;
@@ -70,7 +70,7 @@ public class OthersWorkingSetElementUpdater extends WorkingSetElementUpdater {
Object[] elements = viewer.getNavigatorContentService().createCommonContentProvider().getElements(ViewRoot.getInstance());
// Get all working sets
- WorkingSetViewStateManager manager = viewer.getCommonNavigator() instanceof View ? ((View)viewer.getCommonNavigator()).getStateManager() : null;
+ WorkingSetViewStateManager manager = (WorkingSetViewStateManager)Platform.getAdapterManager().getAdapter(viewer.getCommonNavigator(), WorkingSetViewStateManager.class);
IWorkingSet[] allWorkingSets = manager != null ? manager.getAllWorkingSets() : new IWorkingSet[0];
// Loop the elements and check if they are contained in a working set
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementAdapter.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementAdapter.java
index 0c1bf4c3d..0c1bf4c3d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementAdapter.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementAdapter.java
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolder.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolder.java
index e4ed9c94f..e4ed9c94f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolder.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolder.java
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderAdapterFactory.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderAdapterFactory.java
index ff21620d7..ff21620d7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderAdapterFactory.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderAdapterFactory.java
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderFactory.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderFactory.java
index 049ac8f7e..049ac8f7e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderFactory.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementHolderFactory.java
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementUpdater.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementUpdater.java
index b3a0269ff..b3a0269ff 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementUpdater.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetElementUpdater.java
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetFilter.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetFilter.java
index cc1b60173..cc1b60173 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetFilter.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetFilter.java
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewStateManager.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewStateManager.java
index 61f9b28ab..446af405d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewStateManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewStateManager.java
@@ -25,11 +25,11 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.tcf.te.ui.views.activator.UIPlugin;
import org.eclipse.tcf.te.ui.views.interfaces.workingsets.IWorkingSetIDs;
import org.eclipse.tcf.te.ui.views.interfaces.workingsets.IWorkingSetNameIDs;
import org.eclipse.tcf.te.ui.views.internal.View;
-import org.eclipse.tcf.te.ui.views.nls.Messages;
+import org.eclipse.tcf.te.ui.views.workingsets.activator.UIPlugin;
+import org.eclipse.tcf.te.ui.views.workingsets.nls.Messages;
import org.eclipse.ui.IElementFactory;
import org.eclipse.ui.ILocalWorkingSetManager;
import org.eclipse.ui.IMemento;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewerSorter.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewerSorter.java
index fd9d998be..6f7b28b1e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewerSorter.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetViewerSorter.java
@@ -9,9 +9,9 @@
*******************************************************************************/
package org.eclipse.tcf.te.ui.views.workingsets;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.tcf.te.ui.trees.TreeViewerSorter;
-import org.eclipse.tcf.te.ui.views.internal.View;
import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.internal.WorkingSetComparator;
import org.eclipse.ui.navigator.CommonViewer;
@@ -30,8 +30,8 @@ public class WorkingSetViewerSorter extends TreeViewerSorter {
protected int doCompare(Viewer viewer, Object node1, Object node2, String sortColumn, int index, int inverter) {
if (node1 instanceof IWorkingSet && node2 instanceof IWorkingSet) {
WorkingSetViewStateManager manager = null;
- if (viewer instanceof CommonViewer && ((CommonViewer)viewer).getCommonNavigator() instanceof View) {
- manager = ((View)((CommonViewer)viewer).getCommonNavigator()).getStateManager();
+ if (viewer instanceof CommonViewer && ((CommonViewer)viewer).getCommonNavigator() != null) {
+ manager = (WorkingSetViewStateManager)Platform.getAdapterManager().getAdapter(((CommonViewer)viewer).getCommonNavigator(), WorkingSetViewStateManager.class);
}
if (manager != null) {
if (manager.isSortedWorkingSet()) return wsComparator.compare(node1, node2);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsContentProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsContentProvider.java
index 90f0bdaed..523737c11 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsContentProvider.java
@@ -16,6 +16,7 @@ import java.util.List;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
@@ -24,13 +25,12 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.tcf.te.runtime.events.EventManager;
import org.eclipse.tcf.te.runtime.interfaces.workingsets.IWorkingSetElement;
-import org.eclipse.tcf.te.ui.views.activator.UIPlugin;
import org.eclipse.tcf.te.ui.views.events.ViewerContentChangeEvent;
import org.eclipse.tcf.te.ui.views.interfaces.IUIConstants;
import org.eclipse.tcf.te.ui.views.interfaces.workingsets.IWorkingSetIDs;
-import org.eclipse.tcf.te.ui.views.internal.View;
import org.eclipse.tcf.te.ui.views.internal.ViewRoot;
-import org.eclipse.tcf.te.ui.views.nls.Messages;
+import org.eclipse.tcf.te.ui.views.workingsets.activator.UIPlugin;
+import org.eclipse.tcf.te.ui.views.workingsets.nls.Messages;
import org.eclipse.ui.ILocalWorkingSetManager;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IWorkingSet;
@@ -144,10 +144,8 @@ public class WorkingSetsContentProvider implements ICommonContentProvider {
@Override
public void restoreState(IMemento memento) {
// Determine the view local working set manager instance
- ILocalWorkingSetManager manager = null;
- if (viewer.getCommonNavigator() instanceof View) {
- manager = ((View)viewer.getCommonNavigator()).getStateManager().getLocalWorkingSetManager();
- }
+ WorkingSetViewStateManager mng = (WorkingSetViewStateManager)Platform.getAdapterManager().getAdapter(viewer.getCommonNavigator(), WorkingSetViewStateManager.class);
+ ILocalWorkingSetManager manager = mng != null ? mng.getLocalWorkingSetManager() : null;
// Recreate the local automatic working sets
if (manager != null) {
@@ -224,35 +222,33 @@ public class WorkingSetsContentProvider implements ICommonContentProvider {
*/
@Override
public Object getParent(Object element) {
+ CommonNavigator navigator = viewer.getCommonNavigator();
+ WorkingSetViewStateManager manager = navigator != null ? (WorkingSetViewStateManager)Platform.getAdapterManager().getAdapter(navigator, WorkingSetViewStateManager.class) : null;
+
if (element instanceof IWorkingSet) {
- CommonNavigator navigator = viewer.getCommonNavigator();
- if (navigator instanceof View) {
- WorkingSetViewStateManager manager = ((View)navigator).getStateManager();
- List<IWorkingSet> allWorkingSets = Arrays.asList(manager.getAllWorkingSets());
- if (allWorkingSets.contains(element)) {
- return manager;
- }
+ List<IWorkingSet> allWorkingSets = manager != null ? Arrays.asList(manager.getAllWorkingSets()) : new ArrayList<IWorkingSet>();
+ if (allWorkingSets.contains(element)) {
+ return manager;
}
}
else if (element instanceof WorkingSetElementHolder) {
String wsName = ((WorkingSetElementHolder)element).getWorkingSetName();
if (wsName != null) {
IWorkingSet ws = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(wsName);
- if (ws == null && viewer.getCommonNavigator() instanceof View) {
- ws = ((View)viewer.getCommonNavigator()).getStateManager().getLocalWorkingSetManager().getWorkingSet(wsName);
+ if (ws == null && manager != null) {
+ ws = manager.getLocalWorkingSetManager().getWorkingSet(wsName);
}
return ws;
}
}
else if (element instanceof IWorkingSetElement) {
- CommonNavigator navigator = viewer.getCommonNavigator();
if (navigator != null) {
if (navigator.getRootMode() == IUIConstants.MODE_WORKING_SETS) {
IWorkingSet[] workingSets = PlatformUI.getWorkbench().getWorkingSetManager().getAllWorkingSets();
List<IWorkingSet> list = new ArrayList<IWorkingSet>();
list.addAll(Arrays.asList(workingSets));
- ILocalWorkingSetManager wsManager = ((View) viewer.getCommonNavigator()).getStateManager().getLocalWorkingSetManager();
- workingSets = wsManager.getAllWorkingSets();
+ ILocalWorkingSetManager wsManager = manager != null ? manager.getLocalWorkingSetManager() : null;
+ workingSets = wsManager != null ? wsManager.getAllWorkingSets() : new IWorkingSet[0];
list.addAll(Arrays.asList(workingSets));
for (IWorkingSet workingSet : list) {
IAdaptable[] wsElements = getWorkingSetElements(workingSet);
@@ -312,7 +308,7 @@ public class WorkingSetsContentProvider implements ICommonContentProvider {
boolean filterActive;
if (extensionStateModel.getBooleanProperty(SHOW_TOP_LEVEL_WORKING_SETS)) {
navigator.setRootMode(IUIConstants.MODE_WORKING_SETS);
- newInput = ((View)navigator).getStateManager();
+ newInput = Platform.getAdapterManager().getAdapter(navigator, WorkingSetViewStateManager.class);
filterActive = true;
}
else {
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsLabelProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsLabelProvider.java
index de1b75a74..de1b75a74 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsLabelProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsLabelProvider.java
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/actions/ConfigureWorkingSetAction.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/actions/ConfigureWorkingSetAction.java
index 14156eae5..cc9c84d36 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/actions/ConfigureWorkingSetAction.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/actions/ConfigureWorkingSetAction.java
@@ -16,15 +16,15 @@ import java.util.Comparator;
import java.util.List;
import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.tcf.te.ui.views.interfaces.workingsets.IWorkingSetIDs;
-import org.eclipse.tcf.te.ui.views.internal.View;
-import org.eclipse.tcf.te.ui.views.nls.Messages;
import org.eclipse.tcf.te.ui.views.workingsets.CustomizedOrderComparator;
import org.eclipse.tcf.te.ui.views.workingsets.WorkingSetViewStateManager;
import org.eclipse.tcf.te.ui.views.workingsets.dialogs.WorkingSetConfigurationDialog;
+import org.eclipse.tcf.te.ui.views.workingsets.nls.Messages;
import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.IWorkingSetManager;
import org.eclipse.ui.PlatformUI;
@@ -79,7 +79,7 @@ public class ConfigureWorkingSetAction extends Action {
@Override
public void run() {
// Get the view working set state manager
- WorkingSetViewStateManager manager = ((View)((CommonViewer)viewer).getCommonNavigator()).getStateManager();
+ WorkingSetViewStateManager manager = (WorkingSetViewStateManager)Platform.getAdapterManager().getAdapter(((CommonViewer)viewer).getCommonNavigator(), WorkingSetViewStateManager.class);
// Get the workbench wide working set manager
IWorkingSetManager workingSetManager = PlatformUI.getWorkbench().getWorkingSetManager();
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionGroup.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionGroup.java
index 371071be1..918a7e490 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionGroup.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionGroup.java
@@ -22,10 +22,10 @@ import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.tcf.te.ui.views.activator.UIPlugin;
-import org.eclipse.tcf.te.ui.views.interfaces.ImageConsts;
-import org.eclipse.tcf.te.ui.views.nls.Messages;
import org.eclipse.tcf.te.ui.views.workingsets.WorkingSetsContentProvider;
+import org.eclipse.tcf.te.ui.views.workingsets.activator.UIPlugin;
+import org.eclipse.tcf.te.ui.views.workingsets.interfaces.ImageConsts;
+import org.eclipse.tcf.te.ui.views.workingsets.nls.Messages;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.actions.ActionGroup;
@@ -186,11 +186,12 @@ public class WorkingSetActionGroup extends ActionGroup {
}
}
- private IAction[] createActions() {
+ @SuppressWarnings("restriction")
+ private IAction[] createActions() {
elementsAction = new TopLevelContentAction(false);
elementsAction.setText(Messages.WorkingSetActionGroup_Elements);
- elementsAction.setImageDescriptor(UIPlugin.getImageDescriptor(ImageConsts.VIEW));
+ elementsAction.setImageDescriptor(org.eclipse.tcf.te.ui.views.activator.UIPlugin.getImageDescriptor(org.eclipse.tcf.te.ui.views.interfaces.ImageConsts.VIEW));
workingSetsAction = new TopLevelContentAction(true);
workingSetsAction.setText(Messages.WorkingSetActionGroup_Working_Set);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionProvider.java
index f67d12ad1..f67d12ad1 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/actions/WorkingSetActionProvider.java
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/activator/UIPlugin.java
new file mode 100644
index 000000000..ca6cb2d44
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/activator/UIPlugin.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.ui.views.workingsets.activator;
+
+import java.net.URL;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.tcf.te.runtime.tracing.TraceHandler;
+import org.eclipse.tcf.te.ui.views.workingsets.interfaces.ImageConsts;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class UIPlugin extends AbstractUIPlugin {
+ // The shared instance
+ private static UIPlugin plugin;
+ // The trace handler instance
+ private static TraceHandler traceHandler;
+
+ /**
+ * The constructor
+ */
+ public UIPlugin() {
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static UIPlugin getDefault() {
+ return plugin;
+ }
+
+ /**
+ * Convenience method which returns the unique identifier of this plugin.
+ */
+ public static String getUniqueIdentifier() {
+ if (getDefault() != null && getDefault().getBundle() != null) {
+ return getDefault().getBundle().getSymbolicName();
+ }
+ return null;
+ }
+
+ /**
+ * Returns the bundles trace handler.
+ *
+ * @return The bundles trace handler.
+ */
+ public static TraceHandler getTraceHandler() {
+ if (traceHandler == null) {
+ traceHandler = new TraceHandler(getUniqueIdentifier());
+ }
+ return traceHandler;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ traceHandler = null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry)
+ */
+ @Override
+ protected void initializeImageRegistry(ImageRegistry registry) {
+ URL url = UIPlugin.getDefault().getBundle().getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_OBJ + "workingset.gif"); //$NON-NLS-1$
+ registry.put(ImageConsts.WORKING_SET, ImageDescriptor.createFromURL(url));
+ url = UIPlugin.getDefault().getBundle().getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_OBJ + "workingsets.gif"); //$NON-NLS-1$
+ registry.put(ImageConsts.WORKING_SETS, ImageDescriptor.createFromURL(url));
+ }
+
+ /**
+ * Loads the image registered under the specified key from the image
+ * registry and returns the <code>Image</code> object instance.
+ *
+ * @param key The key the image is registered with.
+ * @return The <code>Image</code> object instance or <code>null</code>.
+ */
+ public static Image getImage(String key) {
+ return getDefault().getImageRegistry().get(key);
+ }
+
+ /**
+ * Loads the image registered under the specified key from the image
+ * registry and returns the <code>ImageDescriptor</code> object instance.
+ *
+ * @param key The key the image is registered with.
+ * @return The <code>ImageDescriptor</code> object instance or <code>null</code>.
+ */
+ public static ImageDescriptor getImageDescriptor(String key) {
+ return getDefault().getImageRegistry().getDescriptor(key);
+ }
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/dialogs/WorkingSetConfigurationDialog.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/dialogs/WorkingSetConfigurationDialog.java
index c2b618db4..744aeca87 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/dialogs/WorkingSetConfigurationDialog.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/dialogs/WorkingSetConfigurationDialog.java
@@ -47,7 +47,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.tcf.te.ui.views.interfaces.workingsets.IWorkingSetIDs;
-import org.eclipse.tcf.te.ui.views.nls.Messages;
+import org.eclipse.tcf.te.ui.views.workingsets.nls.Messages;
import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.IWorkingSetManager;
import org.eclipse.ui.dialogs.IWorkingSetEditWizard;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/interfaces/ImageConsts.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/interfaces/ImageConsts.java
new file mode 100644
index 000000000..18050cb85
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/interfaces/ImageConsts.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.ui.views.workingsets.interfaces;
+
+/**
+ * Image registry constants.
+ */
+public interface ImageConsts {
+
+ // ***** The directory structure constants *****
+
+ /**
+ * The root directory where to load the images from, relative to
+ * the bundle directory.
+ */
+ public final static String IMAGE_DIR_ROOT = "icons/"; //$NON-NLS-1$
+
+ /**
+ * The directory where to load view related images from, relative to
+ * the image root directory.
+ */
+ public final static String IMAGE_DIR_EVIEW = "eview16/"; //$NON-NLS-1$
+
+ /**
+ * The directory where to load enabled toolbar images from,
+ * relative to the image root directory.
+ */
+ public final static String IMAGE_DIR_ETOOL = "etool16/"; //$NON-NLS-1$
+
+ /**
+ * The directory where to load model object images from,
+ * relative to the image root directory.
+ */
+ public final static String IMAGE_DIR_OBJ = "obj16/"; //$NON-NLS-1$
+
+ // ***** The image constants *****
+
+ /**
+ * The key to access the working sets image.
+ */
+ public static final String WORKING_SETS = "WorkingSets"; //$NON-NLS-1$
+
+ /**
+ * The key to access the working set image.
+ */
+ public static final String WORKING_SET = "WorkingSet"; //$NON-NLS-1$
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/internal/adapters/AdapterFactory.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/internal/adapters/AdapterFactory.java
new file mode 100644
index 000000000..879618b71
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/internal/adapters/AdapterFactory.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.ui.views.workingsets.internal.adapters;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.tcf.te.ui.views.internal.View;
+import org.eclipse.tcf.te.ui.views.workingsets.WorkingSetViewStateManager;
+
+/**
+ * Adapter factory implementation.
+ */
+public class AdapterFactory implements IAdapterFactory {
+ // Maintain a map of view state manager adapters per view instance
+ /* default */ Map<View, WorkingSetViewStateManager> adapters = new HashMap<View, WorkingSetViewStateManager>();
+
+ private static final Class<?>[] CLASSES = new Class[] {
+ WorkingSetViewStateManager.class
+ };
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
+ */
+ @Override
+ public Object getAdapter(Object adaptableObject, Class adapterType) {
+ if (adaptableObject instanceof View) {
+ if (WorkingSetViewStateManager.class.equals(adapterType)) {
+ // Lookup the adapter
+ WorkingSetViewStateManager adapter = adapters.get(adaptableObject);
+ // No adapter yet -> create a new one for this view
+ if (adapter == null) {
+ adapter = new WorkingSetViewStateManager((View)adaptableObject);
+ adapters.put((View)adaptableObject, adapter);
+ }
+ return adapter;
+ }
+ }
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
+ */
+ @Override
+ public Class[] getAdapterList() {
+ return CLASSES;
+ }
+
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/nls/Messages.java
new file mode 100644
index 000000000..96692c6e3
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/nls/Messages.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.ui.views.workingsets.nls;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Target Explorer UI plugin externalized strings management.
+ */
+public class Messages extends NLS {
+
+ // The plug-in resource bundle name
+ private static final String BUNDLE_NAME = "org.eclipse.tcf.te.ui.views.nls.Messages"; //$NON-NLS-1$
+
+ /**
+ * Static constructor.
+ */
+ static {
+ // Load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ // **** Declare externalized string id's down here *****
+
+ public static String WorkingSetActionProvider_multipleWorkingSets;
+
+ public static String WorkingSetActionGroup_Top_Level_Element;
+ public static String WorkingSetActionGroup_Elements;
+ public static String WorkingSetActionGroup_Working_Set;
+
+ public static String ViewStateManager_others_name;
+
+ public static String ConfigureWorkingSetAction_text;
+ public static String ConfigureWorkingSetAction_toolTip;
+
+ public static String TargetWorkingSetPage_workingSet_name;
+ public static String TargetWorkingSetPage_workspace_content;
+ public static String TargetWorkingSetPage_add_button;
+ public static String TargetWorkingSetPage_addAll_button;
+ public static String TargetWorkingSetPage_remove_button;
+ public static String TargetWorkingSetPage_removeAll_button;
+ public static String TargetWorkingSetPage_workingSet_content;
+ public static String TargetWorkingSetPage_warning_nameWhitespace;
+ public static String TargetWorkingSetPage_warning_nameMustNotBeEmpty;
+ public static String TargetWorkingSetPage_warning_workingSetExists;
+ public static String TargetWorkingSetPage_warning_resourceMustBeChecked;
+ public static String TargetWorkingSetPage_title;
+ public static String TargetWorkingSetPage_workingSet_description;
+
+ public static String WorkingSetConfigurationDialog_down_label;
+ public static String WorkingSetConfigurationDialog_up_label;
+ public static String WorkingSetConfigurationDialog_title;
+ public static String WorkingSetConfigurationDialog_selectAll_label;
+ public static String WorkingSetConfigurationDialog_edit_label;
+ public static String WorkingSetConfigurationDialog_message;
+ public static String WorkingSetConfigurationDialog_deselectAll_label;
+ public static String WorkingSetConfigurationDialog_new_label;
+ public static String WorkingSetConfigurationDialog_sort_working_sets;
+ public static String WorkingSetConfigurationDialog_remove_label;
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/nls/Messages.properties
new file mode 100644
index 000000000..6feb31e24
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/nls/Messages.properties
@@ -0,0 +1,64 @@
+#
+# org.eclipse.tcf.te.ui.views
+# Externalized Strings.
+#
+
+# ***** View *****
+
+View_toolTip= Working Set: {0}
+View_toolTip2= {0} - Working Set: {1}
+View_toolTip3= {0}/{1}
+View_workingSetModel=Working Sets
+
+# ***** Action Provider *****
+
+NewActionProvider_NewMenu_label=&New
+NewActionProvider_NewWizardCommandAction_label=&Other...
+NewActionProvider_NewWizardCommandAction_tooltip=Open the New wizard
+
+WorkingSetActionProvider_multipleWorkingSets=Multiple Working Sets
+
+WorkingSetActionGroup_Top_Level_Element=&Top Level Elements
+WorkingSetActionGroup_Elements=Elements
+WorkingSetActionGroup_Working_Set=Working Sets
+
+ViewStateManager_others_name=Other
+
+ConfigureWorkingSetAction_text=Configure Working Sets...
+ConfigureWorkingSetAction_toolTip=Configure Working Sets...
+
+# ***** Command Handler *****
+
+PropertiesCommandHandler_error_initPartFailed=Failed to initialize the properties editor for the selected node.
+
+# ***** Wizard and Dialog Pages *****
+
+TargetWorkingSetPage_warning_nameMustNotBeEmpty=The name must not be empty.
+TargetWorkingSetPage_workingSet_name=&Working set name\:
+TargetWorkingSetPage_workingSet_description=Enter a working set name and select the working set elements.
+TargetWorkingSetPage_removeAll_button=\ <- R&emove All
+TargetWorkingSetPage_remove_button=<- &Remove
+TargetWorkingSetPage_workspace_content=A&vailable targets\:
+TargetWorkingSetPage_workingSet_content=Working set &content\:
+TargetWorkingSetPage_add_button=&Add ->
+TargetWorkingSetPage_warning_workingSetExists=A working set with that name already exists.
+TargetWorkingSetPage_warning_resourceMustBeChecked=No resources selected.
+TargetWorkingSetPage_addAll_button=A&dd All ->
+TargetWorkingSetPage_title=Target Working Set
+TargetWorkingSetPage_warning_nameWhitespace=The name must not have leading or trailing whitespace.
+
+WorkingSetConfigurationDialog_down_label=&Down
+WorkingSetConfigurationDialog_up_label=&Up
+WorkingSetConfigurationDialog_title=Configure Working Sets
+WorkingSetConfigurationDialog_selectAll_label=Select &All
+WorkingSetConfigurationDialog_edit_label=&Edit...
+WorkingSetConfigurationDialog_message=Select and sort &working sets visible in Target Explorer\:
+WorkingSetConfigurationDialog_deselectAll_label=Dese&lect All
+WorkingSetConfigurationDialog_new_label=&New...
+WorkingSetConfigurationDialog_sort_working_sets=&Sort working sets
+WorkingSetConfigurationDialog_remove_label=&Remove
+
+# ***** Editor Pages *****
+
+AbstractCustomFormToolkitEditorPage_HelpAction_label=Help
+AbstractCustomFormToolkitEditorPage_HelpAction_tooltip=Help
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/pages/AbstractWorkingSetWizardPage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/pages/AbstractWorkingSetWizardPage.java
index d10fb1e6b..1be5b46ad 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/pages/AbstractWorkingSetWizardPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/pages/AbstractWorkingSetWizardPage.java
@@ -44,9 +44,9 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.tcf.te.ui.views.nls.Messages;
-import org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolder;
import org.eclipse.tcf.te.runtime.interfaces.workingsets.IWorkingSetElement;
+import org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolder;
+import org.eclipse.tcf.te.ui.views.workingsets.nls.Messages;
import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.IWorkingSetManager;
import org.eclipse.ui.PlatformUI;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/pages/TargetWorkingSetPage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/pages/TargetWorkingSetPage.java
index 416a6383c..00dbb8db9 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/workingsets/pages/TargetWorkingSetPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/pages/TargetWorkingSetPage.java
@@ -20,15 +20,15 @@ import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.tcf.te.runtime.interfaces.workingsets.IWorkingSetElement;
+import org.eclipse.tcf.te.ui.trees.TreeArrayContentProvider;
import org.eclipse.tcf.te.ui.views.ViewsUtil;
-import org.eclipse.tcf.te.ui.views.activator.UIPlugin;
import org.eclipse.tcf.te.ui.views.interfaces.IUIConstants;
-import org.eclipse.tcf.te.ui.views.interfaces.ImageConsts;
import org.eclipse.tcf.te.ui.views.internal.ViewRoot;
-import org.eclipse.tcf.te.ui.views.nls.Messages;
import org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolder;
-import org.eclipse.tcf.te.runtime.interfaces.workingsets.IWorkingSetElement;
-import org.eclipse.tcf.te.ui.trees.TreeArrayContentProvider;
+import org.eclipse.tcf.te.ui.views.workingsets.activator.UIPlugin;
+import org.eclipse.tcf.te.ui.views.workingsets.interfaces.ImageConsts;
+import org.eclipse.tcf.te.ui.views.workingsets.nls.Messages;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.navigator.CommonNavigator;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF
index 9a73ce89f..6ce707198 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/META-INF/MANIFEST.MF
@@ -33,12 +33,8 @@ Export-Package: org.eclipse.tcf.te.ui.views,
org.eclipse.tcf.te.ui.views.interfaces.handler,
org.eclipse.tcf.te.ui.views.interfaces.tracing;x-internal:=true,
org.eclipse.tcf.te.ui.views.interfaces.workingsets,
- org.eclipse.tcf.te.ui.views.internal;x-internal:=true,
+ org.eclipse.tcf.te.ui.views.internal;x-friends:="org.eclipse.tcf.te.ui.views.workingsets",
org.eclipse.tcf.te.ui.views.listeners,
org.eclipse.tcf.te.ui.views.nls;x-internal:=true,
org.eclipse.tcf.te.ui.views.perspective,
- org.eclipse.tcf.te.ui.views.tabbed,
- org.eclipse.tcf.te.ui.views.workingsets,
- org.eclipse.tcf.te.ui.views.workingsets.actions,
- org.eclipse.tcf.te.ui.views.workingsets.dialogs,
- org.eclipse.tcf.te.ui.views.workingsets.pages
+ org.eclipse.tcf.te.ui.views.tabbed
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
index 5fb6b3201..54d1e8b85 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
@@ -82,60 +82,6 @@
</enablement>
</actionProvider>
-<!-- Working Sets navigator action contributions -->
- <actionProvider
- class="org.eclipse.tcf.te.ui.views.workingsets.actions.WorkingSetActionProvider"
- id="org.eclipse.tcf.te.ui.views.navigator.actions.WorkingSetActions">
- <enablement>
- <or>
- <adapt type="java.lang.Object" />
- <adapt type="java.util.Collection">
- <count value="0" />
- </adapt>
- </or>
- </enablement>
- </actionProvider>
-
-<!-- Working Sets navigator content contributions -->
- <commonFilter
- id="org.eclipse.tcf.te.ui.views.navigator.filters.workingSet"
- name="%filters.workingSet.name"
- description="%filters.workingSet.description"
- class="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetFilter"
- activeByDefault="false"
- visibleInUI="false">
- </commonFilter>
-
- <navigatorContent
- activeByDefault="true"
- contentProvider="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetsContentProvider"
- icon="icons/obj16/workingsets.gif"
- id="org.eclipse.tcf.te.ui.views.navigator.content.workingSets"
- labelProvider="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetsLabelProvider"
- name="%workingsets.extension.name"
- priority="higher">
- <triggerPoints>
- <or>
- <instanceof value="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetViewStateManager"/>
- <instanceof value="org.eclipse.ui.IWorkingSet"/>
- <instanceof value="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolder"/>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof value="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetViewStateManager"/>
- <instanceof value="org.eclipse.ui.IWorkingSet"/>
- <instanceof value="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolder"/>
- <instanceof
- value="org.eclipse.tcf.te.runtime.interfaces.workingsets.IWorkingSetElement">
- </instanceof>
- </or>
- </possibleChildren>
- <commonSorter
- class="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetViewerSorter"
- id="org.eclipse.tcf.te.ui.views.navigator.content.workingSets.sorter">
- </commonSorter>
- </navigatorContent>
<actionProvider
class="org.eclipse.tcf.te.ui.views.actions.GoIntoActionProvider"
id="org.eclipse.tcf.te.ui.views.navigator.actions.GoIntoActionProvider">
@@ -190,49 +136,7 @@
name="%Editor.name">
</editor>
</extension>
-
-<!-- Working Set contributions -->
- <extension point="org.eclipse.ui.workingSets">
- <workingSet
- description="%workingset.description"
- elementAdapterClass="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementAdapter"
- icon="icons/obj16/workingset.gif"
- id="org.eclipse.tcf.te.ui.views.workingset"
- name="%workingset.name"
- pageClass="org.eclipse.tcf.te.ui.views.workingsets.pages.TargetWorkingSetPage"
- updaterClass="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementUpdater">
- </workingSet>
-
- <workingSet
- description="%workingset.others.description"
- icon="icons/obj16/workingset.gif"
- id="org.eclipse.tcf.te.ui.views.workingset.others"
- name="%workingset.others.name"
- updaterClass="org.eclipse.tcf.te.ui.views.workingsets.OthersWorkingSetElementUpdater">
- </workingSet>
- </extension>
-
-<!-- Element factories -->
- <extension point="org.eclipse.ui.elementFactories">
- <factory
- class="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolderFactory"
- id="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolderFactory">
- </factory>
- <factory
- class="org.eclipse.tcf.te.ui.views.workingsets.CustomizedOrderComparatorFactory"
- id="org.eclipse.tcf.te.ui.views.workingsets.CustomizedOrderComparatorFactory">
- </factory>
- </extension>
-<!-- Adapter factories -->
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolder"
- class="org.eclipse.tcf.te.ui.views.workingsets.WorkingSetElementHolderAdapterFactory">
- <adapter type="org.eclipse.tcf.te.runtime.interfaces.workingsets.IWorkingSetElement"/>
- </factory>
- </extension>
-
<!-- Target Explorer menu contributions -->
<extension point="org.eclipse.ui.menus">
<menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?after=group.refresh">
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java
index 45304cfac..a20cc5a5d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java
@@ -110,10 +110,6 @@ public class UIPlugin extends AbstractUIPlugin {
registry.put(ImageConsts.EDITOR, ImageDescriptor.createFromURL(url));
url = UIPlugin.getDefault().getBundle().getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_EVIEW + "targets_view.gif"); //$NON-NLS-1$
registry.put(ImageConsts.VIEW, ImageDescriptor.createFromURL(url));
- url = UIPlugin.getDefault().getBundle().getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_OBJ + "workingset.gif"); //$NON-NLS-1$
- registry.put(ImageConsts.WORKING_SET, ImageDescriptor.createFromURL(url));
- url = UIPlugin.getDefault().getBundle().getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_OBJ + "workingsets.gif"); //$NON-NLS-1$
- registry.put(ImageConsts.WORKING_SETS, ImageDescriptor.createFromURL(url));
url = UIPlugin.getDefault().getBundle().getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_ETOOL + "help.gif"); //$NON-NLS-1$
registry.put(ImageConsts.HELP, ImageDescriptor.createFromURL(url));
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/interfaces/ImageConsts.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/interfaces/ImageConsts.java
index e4c1c5d50..24f5d6746 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/interfaces/ImageConsts.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/interfaces/ImageConsts.java
@@ -53,16 +53,6 @@ public interface ImageConsts {
public static final String VIEW = "View"; //$NON-NLS-1$
/**
- * The key to access the working sets image.
- */
- public static final String WORKING_SETS = "WorkingSets"; //$NON-NLS-1$
-
- /**
- * The key to access the working set image.
- */
- public static final String WORKING_SET = "WorkingSet"; //$NON-NLS-1$
-
- /**
* The key to access the help action image.
*/
public static final String HELP = "HelpAction"; //$NON-NLS-1$
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/internal/View.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/internal/View.java
index 405762535..2448a4c43 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/internal/View.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/internal/View.java
@@ -26,24 +26,17 @@ import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.TreeViewerEditor;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.tcf.te.ui.trees.TreeViewerEditorActivationStrategy;
import org.eclipse.tcf.te.ui.views.activator.UIPlugin;
import org.eclipse.tcf.te.ui.views.interfaces.IRoot;
import org.eclipse.tcf.te.ui.views.interfaces.IUIConstants;
-import org.eclipse.tcf.te.ui.views.nls.Messages;
-import org.eclipse.tcf.te.ui.views.workingsets.WorkingSetViewStateManager;
import org.eclipse.ui.IAggregateWorkingSet;
import org.eclipse.ui.ISources;
import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
-import org.eclipse.ui.internal.navigator.framelist.Frame;
-import org.eclipse.ui.internal.navigator.framelist.FrameList;
-import org.eclipse.ui.internal.navigator.framelist.TreeFrame;
import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.ui.navigator.CommonNavigator;
import org.eclipse.ui.navigator.CommonViewer;
@@ -58,7 +51,6 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
* <p>
* The view is based on the Eclipse Common Navigator framework.
*/
-@SuppressWarnings("restriction")
public class View extends CommonNavigator implements ITabbedPropertySheetPageContributor{
// The view root mode
private int rootMode = IUIConstants.MODE_NORMAL;
@@ -70,16 +62,10 @@ public class View extends CommonNavigator implements ITabbedPropertySheetPageCon
private String workingSetLabel;
/**
- * The working set view state manager.
- */
- private final WorkingSetViewStateManager stateManager;
-
- /**
* Constructor.
*/
public View() {
super();
- stateManager = new WorkingSetViewStateManager(this);
}
/* (non-Javadoc)
@@ -132,21 +118,11 @@ public class View extends CommonNavigator implements ITabbedPropertySheetPageCon
return workingSetLabel;
}
- /**
- * Returns the working set view state manager instance.
- *
- * @return The working set view state manager instance.
- */
- public final WorkingSetViewStateManager getStateManager() {
- return stateManager;
- }
-
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.CommonNavigator#dispose()
*/
@Override
public void dispose() {
- stateManager.dispose();
super.dispose();
}
@@ -247,7 +223,7 @@ public class View extends CommonNavigator implements ITabbedPropertySheetPageCon
IWorkbenchAdapter adapter = (IWorkbenchAdapter) ((IAdaptable) input).getAdapter(IWorkbenchAdapter.class);
if (adapter != null) contentDescription = adapter.getLabel(input);
}
- else if (input instanceof IRoot || input instanceof WorkingSetViewStateManager) {
+ else if (input instanceof IRoot || (input != null && "WorkingSetViewStateManager".equals(input.getClass().getSimpleName()))) { //$NON-NLS-1$
// The root node does not have a content description
}
else if (input != null && !(input instanceof IAggregateWorkingSet)) {
@@ -257,61 +233,8 @@ public class View extends CommonNavigator implements ITabbedPropertySheetPageCon
setContentDescription(contentDescription != null ? contentDescription : ""); //$NON-NLS-1$
}
- /**
- * Returns the tool tip text for the given element.
- *
- * @param element The element or <code>null</code>.
- * @return The tooltip or <code>null</code>.
- */
- @Override
- public String getFrameToolTipText(Object element) {
- String result;
-
- if (element instanceof IAggregateWorkingSet) {
- result = Messages.View_workingSetModel;
- }
- else if (element instanceof IWorkingSet) {
- result = ((IWorkingSet) element).getLabel();
- }
- else {
- result = super.getFrameToolTipText(element);
- }
-
- if (rootMode == IUIConstants.MODE_NORMAL) {
- if (workingSetLabel == null) return result;
- if (result.length() == 0) return NLS.bind(Messages.View_toolTip, workingSetLabel);
- return NLS.bind(Messages.View_toolTip2, result, workingSetLabel);
- }
-
- // Working set mode. During initialization element and viewer can be null.
- if (element != null && !(element instanceof IWorkingSet) && getCommonViewer() != null) {
- FrameList frameList = getCommonViewer().getFrameList();
- // Happens during initialization
- if (frameList == null) return result;
- int index = frameList.getCurrentIndex();
- IWorkingSet ws = null;
- while (index >= 0) {
- Frame frame = frameList.getFrame(index);
- if (frame instanceof TreeFrame) {
- Object input = ((TreeFrame) frame).getInput();
- if (input instanceof IWorkingSet && !(input instanceof IAggregateWorkingSet)) {
- ws = (IWorkingSet) input;
- break;
- }
- }
- index--;
- }
- if (ws != null) {
- return NLS.bind(Messages.View_toolTip3, ws.getLabel(), result);
- }
- return result;
- }
- return result;
-
- }
- /*
- * (non-Javadoc)
+ /* (non-Javadoc)
* @see org.eclipse.ui.navigator.CommonNavigator#getAdapter(java.lang.Class)
*/
@Override
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/nls/Messages.java
index 6f1d3122d..6b7520e3e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/nls/Messages.java
@@ -29,53 +29,12 @@ public class Messages extends NLS {
// **** Declare externalized string id's down here *****
- public static String View_toolTip;
- public static String View_toolTip2;
- public static String View_toolTip3;
- public static String View_workingSetModel;
-
public static String NewActionProvider_NewMenu_label;
public static String NewActionProvider_NewWizardCommandAction_label;
public static String NewActionProvider_NewWizardCommandAction_tooltip;
- public static String WorkingSetActionProvider_multipleWorkingSets;
-
- public static String WorkingSetActionGroup_Top_Level_Element;
- public static String WorkingSetActionGroup_Elements;
- public static String WorkingSetActionGroup_Working_Set;
-
- public static String ViewStateManager_others_name;
-
- public static String ConfigureWorkingSetAction_text;
- public static String ConfigureWorkingSetAction_toolTip;
-
public static String PropertiesCommandHandler_error_initPartFailed;
- public static String TargetWorkingSetPage_workingSet_name;
- public static String TargetWorkingSetPage_workspace_content;
- public static String TargetWorkingSetPage_add_button;
- public static String TargetWorkingSetPage_addAll_button;
- public static String TargetWorkingSetPage_remove_button;
- public static String TargetWorkingSetPage_removeAll_button;
- public static String TargetWorkingSetPage_workingSet_content;
- public static String TargetWorkingSetPage_warning_nameWhitespace;
- public static String TargetWorkingSetPage_warning_nameMustNotBeEmpty;
- public static String TargetWorkingSetPage_warning_workingSetExists;
- public static String TargetWorkingSetPage_warning_resourceMustBeChecked;
- public static String TargetWorkingSetPage_title;
- public static String TargetWorkingSetPage_workingSet_description;
-
- public static String WorkingSetConfigurationDialog_down_label;
- public static String WorkingSetConfigurationDialog_up_label;
- public static String WorkingSetConfigurationDialog_title;
- public static String WorkingSetConfigurationDialog_selectAll_label;
- public static String WorkingSetConfigurationDialog_edit_label;
- public static String WorkingSetConfigurationDialog_message;
- public static String WorkingSetConfigurationDialog_deselectAll_label;
- public static String WorkingSetConfigurationDialog_new_label;
- public static String WorkingSetConfigurationDialog_sort_working_sets;
- public static String WorkingSetConfigurationDialog_remove_label;
-
public static String AbstractCustomFormToolkitEditorPage_HelpAction_label;
public static String AbstractCustomFormToolkitEditorPage_HelpAction_tooltip;
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/nls/Messages.properties
index 6feb31e24..7c275e92f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/nls/Messages.properties
@@ -3,61 +3,16 @@
# Externalized Strings.
#
-# ***** View *****
-
-View_toolTip= Working Set: {0}
-View_toolTip2= {0} - Working Set: {1}
-View_toolTip3= {0}/{1}
-View_workingSetModel=Working Sets
-
# ***** Action Provider *****
NewActionProvider_NewMenu_label=&New
NewActionProvider_NewWizardCommandAction_label=&Other...
NewActionProvider_NewWizardCommandAction_tooltip=Open the New wizard
-WorkingSetActionProvider_multipleWorkingSets=Multiple Working Sets
-
-WorkingSetActionGroup_Top_Level_Element=&Top Level Elements
-WorkingSetActionGroup_Elements=Elements
-WorkingSetActionGroup_Working_Set=Working Sets
-
-ViewStateManager_others_name=Other
-
-ConfigureWorkingSetAction_text=Configure Working Sets...
-ConfigureWorkingSetAction_toolTip=Configure Working Sets...
-
# ***** Command Handler *****
PropertiesCommandHandler_error_initPartFailed=Failed to initialize the properties editor for the selected node.
-# ***** Wizard and Dialog Pages *****
-
-TargetWorkingSetPage_warning_nameMustNotBeEmpty=The name must not be empty.
-TargetWorkingSetPage_workingSet_name=&Working set name\:
-TargetWorkingSetPage_workingSet_description=Enter a working set name and select the working set elements.
-TargetWorkingSetPage_removeAll_button=\ <- R&emove All
-TargetWorkingSetPage_remove_button=<- &Remove
-TargetWorkingSetPage_workspace_content=A&vailable targets\:
-TargetWorkingSetPage_workingSet_content=Working set &content\:
-TargetWorkingSetPage_add_button=&Add ->
-TargetWorkingSetPage_warning_workingSetExists=A working set with that name already exists.
-TargetWorkingSetPage_warning_resourceMustBeChecked=No resources selected.
-TargetWorkingSetPage_addAll_button=A&dd All ->
-TargetWorkingSetPage_title=Target Working Set
-TargetWorkingSetPage_warning_nameWhitespace=The name must not have leading or trailing whitespace.
-
-WorkingSetConfigurationDialog_down_label=&Down
-WorkingSetConfigurationDialog_up_label=&Up
-WorkingSetConfigurationDialog_title=Configure Working Sets
-WorkingSetConfigurationDialog_selectAll_label=Select &All
-WorkingSetConfigurationDialog_edit_label=&Edit...
-WorkingSetConfigurationDialog_message=Select and sort &working sets visible in Target Explorer\:
-WorkingSetConfigurationDialog_deselectAll_label=Dese&lect All
-WorkingSetConfigurationDialog_new_label=&New...
-WorkingSetConfigurationDialog_sort_working_sets=&Sort working sets
-WorkingSetConfigurationDialog_remove_label=&Remove
-
# ***** Editor Pages *****
AbstractCustomFormToolkitEditorPage_HelpAction_label=Help

Back to the top