From 28244240d7a2f60c7bf2e1594386ff5944191194 Mon Sep 17 00:00:00 2001 From: "branflake2267@gmail.com" Date: Wed, 3 Aug 2016 15:25:13 -0700 Subject: [PATCH 01/10] Rename features. --- .../feature.properties | 4 ++-- .../feature.properties | 4 ++-- features/com.google.gdt.eclipse.suite.e44.feature/build.xml | 1 - features/com.google.gdt.eclipse.suite.e44.feature/feature.xml | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/features/com.google.appengine.eclipse.sdkbundle.feature/feature.properties b/features/com.google.appengine.eclipse.sdkbundle.feature/feature.properties index d2e427cb..48a883de 100644 --- a/features/com.google.appengine.eclipse.sdkbundle.feature/feature.properties +++ b/features/com.google.appengine.eclipse.sdkbundle.feature/feature.properties @@ -1,2 +1,2 @@ -featureName = App Engine SDK -providerName = Google, Inc. \ No newline at end of file +featureName = App Engine SDK (GEP) +providerName = GWT Eclipse Plugin \ No newline at end of file diff --git a/features/com.google.appengine.eclipse.wtp.maven.feature/feature.properties b/features/com.google.appengine.eclipse.wtp.maven.feature/feature.properties index 2f1d9d46..d2bda28c 100644 --- a/features/com.google.appengine.eclipse.wtp.maven.feature/feature.properties +++ b/features/com.google.appengine.eclipse.wtp.maven.feature/feature.properties @@ -1,2 +1,2 @@ -featureName = Google App Engine Maven Integration -providerName = Google, Inc. \ No newline at end of file +featureName = Google App Engine Maven Integration (GEP) +providerName = GWT Eclipse Plugin \ No newline at end of file diff --git a/features/com.google.gdt.eclipse.suite.e44.feature/build.xml b/features/com.google.gdt.eclipse.suite.e44.feature/build.xml index ec0d89b9..e5e93387 100644 --- a/features/com.google.gdt.eclipse.suite.e44.feature/build.xml +++ b/features/com.google.gdt.eclipse.suite.e44.feature/build.xml @@ -1,5 +1,4 @@ diff --git a/features/com.google.gdt.eclipse.suite.e44.feature/feature.xml b/features/com.google.gdt.eclipse.suite.e44.feature/feature.xml index cb0b1109..8323c38e 100644 --- a/features/com.google.gdt.eclipse.suite.e44.feature/feature.xml +++ b/features/com.google.gdt.eclipse.suite.e44.feature/feature.xml @@ -7,11 +7,11 @@ plugin="com.google.gdt.eclipse.suite"> - Support for the development of GWT Projects in Eclipse + Support for the development of GWT Projects in Eclipse (GEP) - Copyright 2009 - 2015 + Copyright 2009 - 2016 From 617b7d43d6b38225717a7e51f58239c29071a838 Mon Sep 17 00:00:00 2001 From: "branflake2267@gmail.com" Date: Tue, 9 Aug 2016 16:05:10 -0700 Subject: [PATCH 02/10] Issue 151 - Fixing double click launching. --- .../LaunchConfigurationContent.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/com.google.gwt.eclipse.oophm/src/com/google/gwt/eclipse/oophm/views/hierarchical/LaunchConfigurationContent.java b/plugins/com.google.gwt.eclipse.oophm/src/com/google/gwt/eclipse/oophm/views/hierarchical/LaunchConfigurationContent.java index ade527d1..73461649 100644 --- a/plugins/com.google.gwt.eclipse.oophm/src/com/google/gwt/eclipse/oophm/views/hierarchical/LaunchConfigurationContent.java +++ b/plugins/com.google.gwt.eclipse.oophm/src/com/google/gwt/eclipse/oophm/views/hierarchical/LaunchConfigurationContent.java @@ -137,13 +137,13 @@ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { this.viewer = (TreeViewer) viewer; if (oldInput != null) { - ((LaunchConfiguration) oldInput).getModel().removeWebAppDebugModelListener( - launchUrlsChangedListener); + ((LaunchConfiguration) oldInput).getModel() + .removeWebAppDebugModelListener(launchUrlsChangedListener); } if (newInput != null) { - ((LaunchConfiguration) newInput).getModel().addWebAppDebugModelListener( - launchUrlsChangedListener); + ((LaunchConfiguration) newInput).getModel() + .addWebAppDebugModelListener(launchUrlsChangedListener); updateLaunchUrlsOrLoadingOnViewer(); } } @@ -196,10 +196,10 @@ public void removeListener(ILabelProviderListener listener) {} private final TextTransfer textTransferInstance = TextTransfer.getInstance(); private final LaunchConfiguration launchConfiguration; private TreeViewer viewer; - private BrowserMenuPopulator browserMenuPopulator = new BrowserMenuPopulator( - new BrowserMenuPopulator.DefaultBrowserProvider() { - private final String ATTR_PREVIOUS_BROWSER = GWTPlugin.PLUGIN_ID + ".oophm." - + LaunchConfigurationContent.class.getSimpleName(); + private BrowserMenuPopulator browserMenuPopulator = + new BrowserMenuPopulator(new BrowserMenuPopulator.DefaultBrowserProvider() { + private final String ATTR_PREVIOUS_BROWSER = + GWTPlugin.PLUGIN_ID + ".oophm." + LaunchConfigurationContent.class.getSimpleName(); @Override public String getDefaultBrowserName() { @@ -269,7 +269,7 @@ private void createViewer(Label launchUrlsCaptionLabel) { viewer.addDoubleClickListener(new IDoubleClickListener() { @Override public void doubleClick(DoubleClickEvent event) { - + browserMenuPopulator.openDefaultBrowser(getProject(launchConfiguration), getSelectedUrl()); } }); } From ed288db937e1f2f5a956d2f2094890342238edc1 Mon Sep 17 00:00:00 2001 From: "branflake2267@gmail.com" Date: Tue, 9 Aug 2016 16:34:21 -0700 Subject: [PATCH 03/10] Issue 13 - Removal of the android feature. --- .../.project | 17 ------ .../build.properties | 2 - .../feature.properties | 2 - .../feature.xml | 57 ------------------- .../pom.xml | 15 ----- 5 files changed, 93 deletions(-) delete mode 100644 features/com.google.gdt.eclipse.mobile.android.feature/.project delete mode 100644 features/com.google.gdt.eclipse.mobile.android.feature/build.properties delete mode 100644 features/com.google.gdt.eclipse.mobile.android.feature/feature.properties delete mode 100644 features/com.google.gdt.eclipse.mobile.android.feature/feature.xml delete mode 100644 features/com.google.gdt.eclipse.mobile.android.feature/pom.xml diff --git a/features/com.google.gdt.eclipse.mobile.android.feature/.project b/features/com.google.gdt.eclipse.mobile.android.feature/.project deleted file mode 100644 index 4fd51075..00000000 --- a/features/com.google.gdt.eclipse.mobile.android.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - com.google.gdt.eclipse.mobile.android.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/com.google.gdt.eclipse.mobile.android.feature/build.properties b/features/com.google.gdt.eclipse.mobile.android.feature/build.properties deleted file mode 100644 index b3a611b5..00000000 --- a/features/com.google.gdt.eclipse.mobile.android.feature/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = feature.xml,\ - feature.properties diff --git a/features/com.google.gdt.eclipse.mobile.android.feature/feature.properties b/features/com.google.gdt.eclipse.mobile.android.feature/feature.properties deleted file mode 100644 index 0fb73958..00000000 --- a/features/com.google.gdt.eclipse.mobile.android.feature/feature.properties +++ /dev/null @@ -1,2 +0,0 @@ -featureName = Google App Engine Tools for Android -providerName = Google, Inc. diff --git a/features/com.google.gdt.eclipse.mobile.android.feature/feature.xml b/features/com.google.gdt.eclipse.mobile.android.feature/feature.xml deleted file mode 100644 index cf1a06f6..00000000 --- a/features/com.google.gdt.eclipse.mobile.android.feature/feature.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - App Engine Tools for Android extensions to the Google Plugin for Eclipse - - - - Copyright 2012 Google Inc. - - - - @FEATURE_LICENSE@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/features/com.google.gdt.eclipse.mobile.android.feature/pom.xml b/features/com.google.gdt.eclipse.mobile.android.feature/pom.xml deleted file mode 100644 index 7b24a791..00000000 --- a/features/com.google.gdt.eclipse.mobile.android.feature/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - - com.google.eclipse.gpe - trunk - 0.0.1-SNAPSHOT - ../../ - - com.google.eclipse.gpe - com.google.gdt.eclipse.mobile.android.feature - 0.0.0-SNAPSHOT - eclipse-feature - From e09335f07b40f696a44a1ad3d06289337630179c Mon Sep 17 00:00:00 2001 From: "branflake2267@gmail.com" Date: Tue, 9 Aug 2016 16:54:15 -0700 Subject: [PATCH 04/10] Issue 141 - Removal of the gwt-dev-tools plugins. They were not connected to anything. --- pom.xml | 1 - tools/gwt-dev-tools-gen/.classpath | 7 - tools/gwt-dev-tools-gen/.project | 34 -- .../.settings/org.eclipse.jdt.core.prefs | 420 ------------------ .../.settings/org.eclipse.jdt.ui.prefs | 82 ---- tools/gwt-dev-tools-gen/META-INF/MANIFEST.MF | 13 - tools/gwt-dev-tools-gen/build.properties | 6 - tools/gwt-dev-tools-gen/icons/sample.gif | Bin 983 -> 0 bytes tools/gwt-dev-tools-gen/plugin.xml | 22 - .../gwt/eclipse/devtoolsgen/Activator.java | 51 --- .../actions/PopulateGwtDevTools.java | 305 ------------- tools/gwt-dev-tools/.classpath | 13 - tools/gwt-dev-tools/.project | 17 - tools/gwt-dev-tools/src/Deps.java | 46 -- 14 files changed, 1017 deletions(-) delete mode 100644 tools/gwt-dev-tools-gen/.classpath delete mode 100644 tools/gwt-dev-tools-gen/.project delete mode 100644 tools/gwt-dev-tools-gen/.settings/org.eclipse.jdt.core.prefs delete mode 100644 tools/gwt-dev-tools-gen/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 tools/gwt-dev-tools-gen/META-INF/MANIFEST.MF delete mode 100644 tools/gwt-dev-tools-gen/build.properties delete mode 100644 tools/gwt-dev-tools-gen/icons/sample.gif delete mode 100644 tools/gwt-dev-tools-gen/plugin.xml delete mode 100644 tools/gwt-dev-tools-gen/src/com/google/gwt/eclipse/devtoolsgen/Activator.java delete mode 100644 tools/gwt-dev-tools-gen/src/com/google/gwt/eclipse/devtoolsgen/actions/PopulateGwtDevTools.java delete mode 100644 tools/gwt-dev-tools/.classpath delete mode 100644 tools/gwt-dev-tools/.project delete mode 100644 tools/gwt-dev-tools/src/Deps.java diff --git a/pom.xml b/pom.xml index 7b745deb..3f41f391 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,6 @@ features/com.google.gdt.eclipse.suite.e44.feature features/com.google.gwt.eclipse.sdkbundle.feature features/com.google.appengine.eclipse.sdkbundle.feature - plugins/com.google.appengine.eclipse.core plugins/com.google.appengine.eclipse.core.test diff --git a/tools/gwt-dev-tools-gen/.classpath b/tools/gwt-dev-tools-gen/.classpath deleted file mode 100644 index 098194ca..00000000 --- a/tools/gwt-dev-tools-gen/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/tools/gwt-dev-tools-gen/.project b/tools/gwt-dev-tools-gen/.project deleted file mode 100644 index bde8b0e7..00000000 --- a/tools/gwt-dev-tools-gen/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - gwt-dev-tools-gen - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - com.atlassw.tools.eclipse.checkstyle.CheckstyleNature - - diff --git a/tools/gwt-dev-tools-gen/.settings/org.eclipse.jdt.core.prefs b/tools/gwt-dev-tools-gen/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 03b32044..00000000 --- a/tools/gwt-dev-tools-gen/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,420 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -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=ignore -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -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=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=default -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -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.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -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.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -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=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 -org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled -org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,LOW,HIGH,HIGH -org.eclipse.jdt.core.compiler.taskTags=TODO(${user})\:,TODO,FIXME,XXX -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=16 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -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=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -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=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -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=0 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 -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=2 -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_lambda_body=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=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -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_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=false -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=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.force_if_else_statement_brace=true -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=true -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert -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_member=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_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not 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=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not 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=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not 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=do not 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_lambda_arrow=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=do not 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=do not 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_lambda_arrow=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=false -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=false -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=3 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -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_comment_inline_tags=false -org.eclipse.jdt.core.formatter.wrap_non_simple_local_variable_annotation=true -org.eclipse.jdt.core.formatter.wrap_non_simple_member_annotation=true -org.eclipse.jdt.core.formatter.wrap_non_simple_package_annotation=true -org.eclipse.jdt.core.formatter.wrap_non_simple_parameter_annotation=false -org.eclipse.jdt.core.formatter.wrap_non_simple_type_annotation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.formatter.wrap_prefer_two_fragments=false diff --git a/tools/gwt-dev-tools-gen/.settings/org.eclipse.jdt.ui.prefs b/tools/gwt-dev-tools-gen/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 0d0a0d7c..00000000 --- a/tools/gwt-dev-tools-gen/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,82 +0,0 @@ -comment_clear_blank_lines=false -comment_format_comments=true -comment_format_header=true -comment_format_html=false -comment_format_source_code=false -comment_indent_parameter_description=true -comment_indent_root_tags=true -comment_line_length=100 -comment_new_line_for_parameter=false -comment_separate_root_tags=true -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_GPE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=com.google;android;com;junit;net;org;sun;java;javax; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=999 -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.staticondemandthreshold=999 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=false -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=false -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=false -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=false -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=false -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=false -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=true -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=false -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=false -sp_cleanup.remove_unused_private_types=false -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_lambda=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=false -sp_cleanup.use_type_arguments=false diff --git a/tools/gwt-dev-tools-gen/META-INF/MANIFEST.MF b/tools/gwt-dev-tools-gen/META-INF/MANIFEST.MF deleted file mode 100644 index 24552d17..00000000 --- a/tools/gwt-dev-tools-gen/META-INF/MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: DevToolsGen Plug-in -Bundle-SymbolicName: com.google.gwt.eclipse.devToolsGen; singleton:=true -Bundle-Version: 1.0.0 -Bundle-Activator: com.google.gwt.eclipse.devtoolsgen.Activator -Bundle-Vendor: GOOGLE -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.jdt.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Bundle-ActivationPolicy: lazy diff --git a/tools/gwt-dev-tools-gen/build.properties b/tools/gwt-dev-tools-gen/build.properties deleted file mode 100644 index 0d3d3a74..00000000 --- a/tools/gwt-dev-tools-gen/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = plugin.xml,\ - META-INF/,\ - .,\ - icons/ diff --git a/tools/gwt-dev-tools-gen/icons/sample.gif b/tools/gwt-dev-tools-gen/icons/sample.gif deleted file mode 100644 index 34fb3c9d8cb7d489681b7f7aee4bdcd7eaf53610..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 983 zcmZ?wbhEHb6krfw_|CxKYUg-n!?izO{@9*?jxd%4aX0yzy`dymabz zw#(eg=y~&N&n)dZv2xzduG}5lraiApo3(c4*{Ylg5#|$JO_EEZ<^|a2`Z*=9ns7DV zy=TR&gYw*7f%auV?ip3tvjRPmcdoho{K?x$_vR?C#t5&<;~V}S*>OMCr>h}%%bLZ9 zmo3`hYEwTICo-TTCZwgTsC&VjZRgJ1eE#fBa^%9R zmmfWS@;bnyJ27HWY}kxYzv(Hl>yu;FCPlAEh+34Muq-8Rb6C)<8qA3{r2e5 z`$vyngh#H=FWlqqvnapfc5%(!sQ4v?r7J61-&eJNEN^;KTK}T7{#i-gJh%G*9vcYdwv_*~xdw!Gz4Va?T!sXyyF@8?w<>X`X=#j%uHV4GRvj@+tE@ zQ%F!a)GKcn^~8abN>4la1UNXVL;{ZWi)lEwyeatDu%Lr6;aASiLrXXW zQm# - - - - - - - - - - - diff --git a/tools/gwt-dev-tools-gen/src/com/google/gwt/eclipse/devtoolsgen/Activator.java b/tools/gwt-dev-tools-gen/src/com/google/gwt/eclipse/devtoolsgen/Activator.java deleted file mode 100644 index fdf604ad..00000000 --- a/tools/gwt-dev-tools-gen/src/com/google/gwt/eclipse/devtoolsgen/Activator.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright 2011 Google Inc. All Rights Reserved. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -package com.google.gwt.eclipse.devtoolsgen; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle. - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "com.google.gwt.eclipse.devToolsGen"; - - // The shared instance - private static Activator plugin; - - public static Activator getDefault() { - return plugin; - } - - public static ImageDescriptor getImageDescriptor(String path) { - return imageDescriptorFromPlugin(PLUGIN_ID, path); - } - - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } -} diff --git a/tools/gwt-dev-tools-gen/src/com/google/gwt/eclipse/devtoolsgen/actions/PopulateGwtDevTools.java b/tools/gwt-dev-tools-gen/src/com/google/gwt/eclipse/devtoolsgen/actions/PopulateGwtDevTools.java deleted file mode 100644 index d0fcd01a..00000000 --- a/tools/gwt-dev-tools-gen/src/com/google/gwt/eclipse/devtoolsgen/actions/PopulateGwtDevTools.java +++ /dev/null @@ -1,305 +0,0 @@ -/******************************************************************************* - * Copyright 2011 Google Inc. All Rights Reserved. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -package com.google.gwt.eclipse.devtoolsgen.actions; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.jobs.ISchedulingRule; -import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IPackageFragment; -import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.dom.AST; -import org.eclipse.jdt.core.dom.ASTParser; -import org.eclipse.jdt.core.dom.ASTVisitor; -import org.eclipse.jdt.core.dom.ArrayInitializer; -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jdt.core.dom.FieldDeclaration; -import org.eclipse.jdt.core.dom.IBinding; -import org.eclipse.jdt.core.dom.ITypeBinding; -import org.eclipse.jdt.core.dom.SimpleName; -import org.eclipse.jdt.core.dom.StringLiteral; -import org.eclipse.jdt.core.dom.VariableDeclarationFragment; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.IWorkbenchWindowActionDelegate; - -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -/** - * Computes the Google Plugin for Eclipse's transitive dependencies on GWT. - */ -// Steps for generating gwt-dev-tools.jar -// -// 1. Run this plugin using an Eclipse Application launch configuration. -// -// In the Eclipse you just launched: -// 2. Import the GWT source projects (gwt-dev, gwt-user) and the gwt-dev-tools -// project. -// 3. Set the GWT_TOOLS classpath variable appropriately. -// 4. Add import statements to Deps.java in gwt-dev-tools for all GWT classes -// directly referenced by the GWT plugin. -// 4a. If the new GWT classes have dependencies on new external JAR files, add -// them to the build path of the gwt-dev-tools project (use GWT_TOOLS variable). -// 5. Click the purple Eclipse button in the toolbar. Watch the Console of the -// development workbench as the plugin searches for dependencies. -// 6. When the job finishes, the gwt-dev-tools project should contain exactly -// the transitive set of compilation units needed by the GWT plugin. -// -// 7. Create a staging directory for the new gwt-dev-tools JAR. -// 8. Copy the gwt-dev-tools bin directory (except Deps.class) into the staging -// directory. -// 9. Unjar the external GWT jars referenced by gwt-dev-tools project into the -// staging directory (make sure not to overwrite existing files). -// 10. Jar the staging directory: "jar -cf gwt-dev-tools.jar -C ." -// 11. Copy the new gwt-dev-tool.jar to the GWT plugin's /libs directory, and -// then commit the updated gwt-dev-tools.jar and Deps.java. -// -public class PopulateGwtDevTools implements IWorkbenchWindowActionDelegate { - - private class CopyDepsToGwtDevTools implements IWorkspaceRunnable { - - @Override - public void run(IProgressMonitor monitor) throws CoreException { - IPackageFragmentRoot srcRoot = - gwtDevTools.findPackageFragmentRoot(new Path("/gwt-dev-tools/src/")); - - System.out.print("Copying files to gwt-dev-tools..."); - for (IFile dep : deps) { - IPackageFragment srcPckg = (IPackageFragment) JavaCore.create(dep.getParent()); - IPackageFragment dstPckg = - srcRoot.createPackageFragment(srcPckg.getElementName(), false, null); - - dep.copy(dstPckg.getPath().append(dep.getName()), false, null); - } - - System.out.println("done"); - } - } - - private class DependencyCollector extends ASTVisitor { - - private final int callGraphLevel; - - public DependencyCollector(int callGraphLevel) { - this.callGraphLevel = callGraphLevel; - } - - @Override - @SuppressWarnings("unchecked") - public void endVisit(FieldDeclaration node) { - if (!((CompilationUnit) node.getRoot()).getJavaElement().getElementName().equals("Deps.java")) { - return; - } - - for (VariableDeclarationFragment fragment : (List) node - .fragments()) { - if (fragment.getName().getIdentifier().equals("RESOURCES")) { - ArrayInitializer array = (ArrayInitializer) fragment.getInitializer(); - for (StringLiteral arrayItem : (List) array.expressions()) { - try { - IFile resource = findResourceInGwtProjects(new Path(arrayItem.getLiteralValue())); - if (resource != null) { - deps.add(resource); - printDependency(resource); - } - } catch (JavaModelException e) { - e.printStackTrace(); - } - } - } - } - } - - @Override - public void endVisit(SimpleName node) { - IBinding binding = node.resolveBinding(); - if (binding == null) { - // Ignore nodes for which there is no binding - return; - } - - if (binding.getKind() == IBinding.TYPE) { - ITypeBinding typeBinding = (ITypeBinding) binding; - - try { - if (typeBinding.isFromSource()) { - String qualifiedTypeName = typeBinding.getQualifiedName(); - IType type = findTypeInGwtProjects(qualifiedTypeName); - if (type != null) { - ICompilationUnit cu = type.getCompilationUnit(); - IFile javaFile = (IFile) cu.getResource(); - - // Ignore compilation units we've already seen - if (deps.contains(javaFile)) { - return; - } - - deps.add(javaFile); - printDependency(javaFile); - - // Find dependencies pulled in by this compilation unit - findAllDependencies(cu, callGraphLevel + 1); - } - } - } catch (JavaModelException e) { - e.printStackTrace(); - } - } - } - - private void printDependency(IFile file) { - for (int i = 0; i < callGraphLevel; i++) { - System.out.print(" "); - } - System.out.println(file.getFullPath().toString()); - } - } - - private static IFile findFileOnClasspath(IJavaProject javaProject, IPath classpathRelativePath) - throws JavaModelException { - for (IPackageFragmentRoot pckgFragmentRoot : javaProject.getPackageFragmentRoots()) { - if (pckgFragmentRoot.isArchive()) { - continue; - } - IPath filepath = pckgFragmentRoot.getPath().append(classpathRelativePath); - IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(filepath); - if (res instanceof IFile) { - return (IFile) res; - } - } - return null; - } - - private static IJavaProject findJavaProject(String name) { - return JavaCore.create(ResourcesPlugin.getWorkspace().getRoot().getProject(name)); - } - - private Set deps = new HashSet(); - - private final IJavaProject gwtDev = findJavaProject("gwt-dev"); - - private final IJavaProject gwtDevTools = findJavaProject("gwt-dev-tools"); - - private final IJavaProject gwtUser = findJavaProject("gwt-user"); - - @Override - public void dispose() {} - - @Override - public void init(IWorkbenchWindow window) {} - - @Override - public void run(IAction action) { - try { - if (gwtDev == null) { - System.err.println("Must import the gwt-dev project"); - return; - } - - if (gwtUser == null) { - System.err.println("Must import the gwt-user project"); - return; - } - - if (gwtDevTools == null) { - System.err.println("Must import the gwt-dev-tools project"); - return; - } - - System.out.println("Searching for dependecies in GWT source projects..."); - - deps.clear(); - IType searchRoot = gwtDevTools.findType("Deps"); - - // Find compilation units and resources we depend on - findAllDependencies(searchRoot.getCompilationUnit(), 0); - int totalDepsCount = deps.size(); - - // Prune out files already in gwt-dev-tools. This eliminates most of the - // bulk copy when you've already run this tool at least once. - Iterator iter = deps.iterator(); - while (iter.hasNext()) { - IFile dep = iter.next(); - - IJavaElement srcRoot = - JavaCore.create(dep.getParent()).getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT); - IPath srcPathRelativePath = - dep.getFullPath().removeFirstSegments(srcRoot.getPath().segmentCount()); - IFile existingFile = findFileOnClasspath(gwtDevTools, srcPathRelativePath); - - if (existingFile != null) { - iter.remove(); - } - } - - System.out.format("Finished dependency search (%d files found; %d new)\n", totalDepsCount, - deps.size()); - - if (!deps.isEmpty()) { - IWorkspaceRunnable op = new CopyDepsToGwtDevTools(); - ISchedulingRule lock = ResourcesPlugin.getWorkspace().getRoot(); - ResourcesPlugin.getWorkspace().run(op, lock, IWorkspace.AVOID_UPDATE, null); - } else { - System.out.println("Done"); - } - } catch (CoreException e) { - e.printStackTrace(); - } - } - - @Override - public void selectionChanged(IAction action, ISelection selection) {} - - private void findAllDependencies(ICompilationUnit cu, int callGraphLevel) { - ASTParser parser = ASTParser.newParser(AST.JLS3); - parser.setResolveBindings(true); - parser.setSource(cu); - CompilationUnit rootCu = (CompilationUnit) parser.createAST(null); - rootCu.accept(new DependencyCollector(callGraphLevel)); - } - - private IFile findResourceInGwtProjects(IPath classpathRelativePath) throws JavaModelException { - IFile res = findFileOnClasspath(gwtDev, classpathRelativePath); - if (res != null) { - return res; - } - return findFileOnClasspath(gwtUser, classpathRelativePath); - } - - private IType findTypeInGwtProjects(String qualifiedTypeName) throws JavaModelException { - IType type = gwtDev.findType(qualifiedTypeName); - if (type != null) { - return type; - } - - return gwtUser.findType(qualifiedTypeName); - } -} diff --git a/tools/gwt-dev-tools/.classpath b/tools/gwt-dev-tools/.classpath deleted file mode 100644 index 8a364a8c..00000000 --- a/tools/gwt-dev-tools/.classpath +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/tools/gwt-dev-tools/.project b/tools/gwt-dev-tools/.project deleted file mode 100644 index 66a3b074..00000000 --- a/tools/gwt-dev-tools/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - gwt-dev-tools - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/tools/gwt-dev-tools/src/Deps.java b/tools/gwt-dev-tools/src/Deps.java deleted file mode 100644 index b29fbd57..00000000 --- a/tools/gwt-dev-tools/src/Deps.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright 2011 Google Inc. All Rights Reserved. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *******************************************************************************/ -import com.google.gwt.core.ext.TreeLogger; -import com.google.gwt.core.ext.UnableToCompleteException; -import com.google.gwt.resources.css.ExtractClassNamesVisitor; -import com.google.gwt.resources.css.GenerateCssAst; -import com.google.gwt.resources.css.ast.CssStylesheet; -import com.google.gwt.dev.util.Empty; -import com.google.gwt.dev.util.JsniRef; -import com.google.gwt.dev.jjs.Correlation; -import com.google.gwt.dev.jjs.InternalCompilerException; -import com.google.gwt.dev.jjs.SourceInfo; -import com.google.gwt.dev.jjs.Correlation.Axis; -import com.google.gwt.dev.js.JsParser; -import com.google.gwt.dev.js.JsParserException; -import com.google.gwt.dev.js.JsParserException.SourceDetail; -import com.google.gwt.dev.js.ast.JsBlock; -import com.google.gwt.dev.js.ast.JsContext; -import com.google.gwt.dev.js.ast.JsExprStmt; -import com.google.gwt.dev.js.ast.JsFunction; -import com.google.gwt.dev.js.ast.JsNameRef; -import com.google.gwt.dev.js.ast.JsProgram; -import com.google.gwt.dev.js.ast.JsStatement; -import com.google.gwt.dev.js.ast.JsVisitor; -import com.google.gwt.uibinder.attributeparsers.CssNameConverter; - -/* - * For instructions on how this class is used, see the PopulateGwtDevTools class - * in the gwt-dev-tools-gen project. - */ -@SuppressWarnings("unused") -class Deps { - String[] RESOURCES = {"com/google/gwt/dev/js/rhino/Messages.properties"}; -} From 84cf0ec0f3aad5ecfa42e9679e7043c68cc6a402 Mon Sep 17 00:00:00 2001 From: "branflake2267@gmail.com" Date: Wed, 10 Aug 2016 06:59:16 -0700 Subject: [PATCH 05/10] Issue 138 - Add beta to the version parser. --- .../google/gdt/eclipse/core/sdk/SdkUtils.java | 88 ++++++++----------- 1 file changed, 38 insertions(+), 50 deletions(-) diff --git a/plugins/com.google.gdt.eclipse.core/src/com/google/gdt/eclipse/core/sdk/SdkUtils.java b/plugins/com.google.gdt.eclipse.core/src/com/google/gdt/eclipse/core/sdk/SdkUtils.java index 091405a2..2e4e03cf 100644 --- a/plugins/com.google.gdt.eclipse.core/src/com/google/gdt/eclipse/core/sdk/SdkUtils.java +++ b/plugins/com.google.gdt.eclipse.core/src/com/google/gdt/eclipse/core/sdk/SdkUtils.java @@ -58,9 +58,8 @@ public String computeMaxSdkVersion(IJavaProject[] projects) { currentMaxVersion = version; } } catch (NumberFormatException e) { - CorePluginLog.logError(e, "Could not compare '" - + currentMaxVersion + "' to '" + version - + "', ignoring this version"); + CorePluginLog.logError(e, + "Could not compare '" + currentMaxVersion + "' to '" + version + "', ignoring this version"); } } @@ -79,20 +78,17 @@ public String computeMaxSdkVersion(IJavaProject[] projects) { } /** - * Returns the {@link Sdk} that is bound to the {@link IJavaProject} or - * null if none. + * Returns the {@link Sdk} that is bound to the {@link IJavaProject} or null if none. */ - public abstract Sdk doFindSdk(IJavaProject project) - throws JavaModelException; + public abstract Sdk doFindSdk(IJavaProject project) throws JavaModelException; } public static final String INTERNAL_VERSION_PREFIX = "0.0."; public static final String INTERNAL_VERSION_SUFFIX = "999"; /** - * In some cases, the 3rd component of the version string can contain both - * digits and non-digits (e.g., 2.1.0M1, 2.1.0-m1); this is incompatible with - * what GPE expects for a SDK version string. + * In some cases, the 3rd component of the version string can contain both digits and non-digits (e.g., 2.1.0M1, + * 2.1.0-m1); this is incompatible with what GPE expects for a SDK version string. */ public static String cleanupVersion(String versionStr) { if (StringUtilities.isEmpty(versionStr)) { @@ -100,7 +96,7 @@ public static String cleanupVersion(String versionStr) { } versionStr = toOSGICompatibleVersionString(versionStr); - + String[] versionComponents = versionStr.split("\\."); if (versionComponents.length != 3) { @@ -128,27 +124,25 @@ public static String cleanupVersion(String versionStr) { } // Add 4th component - return versionComponents[0] + '.' + versionComponents[1] + '.' - + lastComponent.substring(0, nonDigitIndex) + '.' + lastComponent.substring(nonDigitIndex); + return versionComponents[0] + '.' + versionComponents[1] + '.' + lastComponent.substring(0, nonDigitIndex) + '.' + + lastComponent.substring(nonDigitIndex); } /** - * Compares two version strings for order. Returns a negative integer, zero, - * or a positive integer if the first argument is less than, equal to, or - * greater than the second. + * Compares two version strings for order. Returns a negative integer, zero, or a positive integer if the first + * argument is less than, equal to, or greater than the second. *

- * This method handles version strings that include RC or MS, treating them as - * MS < RC < final version. + * This method handles version strings that include RC or MS, treating them as MS < RC < final version. * * @param version1 * @param version2 - * @return a negative integer, zero, or a positive integer if the first - * argument is less than, equal to, or greater than the second + * @return a negative integer, zero, or a positive integer if the first argument is less than, equal to, or greater + * than the second * @throws NumberFormatException - * @throws NullPointerException if either version string is null + * @throws NullPointerException + * if either version string is null */ - public static int compareVersionStrings(String version1, String version2) - throws NumberFormatException { + public static int compareVersionStrings(String version1, String version2) throws NumberFormatException { version1 = SdkUtils.cleanupVersion(version1); version2 = SdkUtils.cleanupVersion(version2); String splitRegex = "[._-]"; @@ -167,11 +161,10 @@ public static int compareVersionStrings(String version1, String version2) } /** - * Returns an {@link Sdk} with a matching installation path from the - * {@link SdkSet} or null if none could be found. + * Returns an {@link Sdk} with a matching installation path from the {@link SdkSet} or null if none could + * be found. */ - public static T findSdkForInstallationPath( - SdkSet sdkSet, IPath installationPath) { + public static T findSdkForInstallationPath(SdkSet sdkSet, IPath installationPath) { for (T sdk : sdkSet) { if (JavaUtilities.equalsWithNullCheck(sdk.getInstallationPath(), installationPath)) { return sdk; @@ -182,14 +175,14 @@ public static T findSdkForInstallationPath( } /** - * Generates a name that is unique to a given {@link SdkSet} based on the name - * prefix. + * Generates a name that is unique to a given {@link SdkSet} based on the name prefix. * - * @param namePrefix name prefix for the generated name - * @param sdks {@link SdkSet} for within which a unique name is needed + * @param namePrefix + * name prefix for the generated name + * @param sdks + * {@link SdkSet} for within which a unique name is needed * - * @return name that is unique to a given {@link SdkSet} based on the name - * prefix + * @return name that is unique to a given {@link SdkSet} based on the name prefix */ public static String generateUniqueSdkNameFrom(String namePrefix, SdkSet sdks) { String generatedName = namePrefix; @@ -214,18 +207,15 @@ public static boolean isInternal(String version) { } /** - * Returns a negative numeric representation of the prerelease version string. - * This is negative so all prereleases are less than the corresponding - * release. + * Returns a negative numeric representation of the prerelease version string. This is negative so all prereleases are + * less than the corresponding release. * - * @param versionString must start with either "rc" or "ms" followed by a - * number that is less than 1000 - * @return a negative numeric representation such that r(rc1) < r(rc10) and - * r(ms__) < r(rc1) + * @param versionString + * must start with either "rc", "beta" or "ms" followed by a number that is less than 1000 + * @return a negative numeric representation such that r(rc1) < r(rc10) and r(ms__) < r(rc1) * @throws NumberFormatException */ - private static int parsePrereleaseVersionString(String versionString) - throws NumberFormatException { + private static int parsePrereleaseVersionString(String versionString) throws NumberFormatException { String prereleaseType = versionString.substring(0, 2); int version = Integer.parseInt(versionString.substring(2)); // Since it must be negative, (1000 - version) so rc1 < rc10 @@ -244,7 +234,7 @@ private static int parseVersionComponent(String[] versionComponents, int compone if (componentIndex < versionComponents.length) { String component = versionComponents[componentIndex].trim().toLowerCase(); if (component.length() > 0) { - if (component.startsWith("rc") || component.startsWith("ms")) { + if (component.startsWith("rc") || component.startsWith("ms") || component.startsWith("beta")) { return parsePrereleaseVersionString(component); } else { return Integer.parseInt(component); @@ -256,20 +246,18 @@ private static int parseVersionComponent(String[] versionComponents, int compone } /** - * Return a string where the modifier is separated from the version number by - * a '.' instead of a '-'. OSGI strings want a '.' to separate the modifier - * from the rest of the version number. + * Return a string where the modifier is separated from the version number by a '.' instead of a '-'. OSGI strings + * want a '.' to separate the modifier from the rest of the version number. */ private static String toOSGICompatibleVersionString(String versionString) { /* - * Note this method does try to parse out the version number, to ensure that - * the replacement only takes place at the start of the qualifier. + * Note this method does try to parse out the version number, to ensure that the replacement only takes place at the + * start of the qualifier. */ return versionString.replaceFirst("-", "."); } - - private SdkUtils() { } + } From e720d0dcfedd19d5acf67f0e0c1f5eb9b2ba85c0 Mon Sep 17 00:00:00 2001 From: "branflake2267@gmail.com" Date: Wed, 24 Aug 2016 20:29:55 -0700 Subject: [PATCH 06/10] Consolidate the GWT Menus. --- .../com.google.gdt.eclipse.core/plugin.xml | 5 +-- .../ui/CoreProjectPropertyPage.java | 2 +- .../MavenProjectConfigurator.java | 39 +++++++++++++------ .../com.google.gwt.eclipse.core/plugin.xml | 2 +- plugins/com.google.gwt.eclipse.wtp/plugin.xml | 11 +----- 5 files changed, 32 insertions(+), 27 deletions(-) diff --git a/plugins/com.google.gdt.eclipse.core/plugin.xml b/plugins/com.google.gdt.eclipse.core/plugin.xml index 0b6da343..738ecaa0 100644 --- a/plugins/com.google.gdt.eclipse.core/plugin.xml +++ b/plugins/com.google.gdt.eclipse.core/plugin.xml @@ -31,10 +31,7 @@ - - - + name="GWT"> + name="Settings"> diff --git a/plugins/com.google.gwt.eclipse.wtp/plugin.xml b/plugins/com.google.gwt.eclipse.wtp/plugin.xml index 864290ef..8a9bf129 100644 --- a/plugins/com.google.gwt.eclipse.wtp/plugin.xml +++ b/plugins/com.google.gwt.eclipse.wtp/plugin.xml @@ -91,18 +91,9 @@ - - - - - - From eb9a1acc5afa6475256e527f3f04a30794670f2e Mon Sep 17 00:00:00 2001 From: "branflake2267@gmail.com" Date: Wed, 24 Aug 2016 20:59:09 -0700 Subject: [PATCH 07/10] Menu change. --- plugins/com.google.gwt.eclipse.core/plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/com.google.gwt.eclipse.core/plugin.xml b/plugins/com.google.gwt.eclipse.core/plugin.xml index 52dd32ee..b72625e3 100644 --- a/plugins/com.google.gwt.eclipse.core/plugin.xml +++ b/plugins/com.google.gwt.eclipse.core/plugin.xml @@ -691,7 +691,7 @@ category="com.google.gdt.eclipse.core.properties.coreProjectPropertyPage" class="com.google.gwt.eclipse.core.properties.ui.GWTProjectPropertyPage" id="com.google.gwt.eclipse.core.properties.ui.gwtProjectPropertyPage" - name="Settings"> + name="General Settings"> From 06e7ff035f4902e7581dda5f7d4ff0339e0a3adf Mon Sep 17 00:00:00 2001 From: "branflake2267@gmail.com" Date: Sat, 17 Sep 2016 04:56:27 -0700 Subject: [PATCH 08/10] GWT Maven 2 plugin enhancements, GWT added to naming, new icon for dev mode launcher, removal of the legacy super dev mode launching for 2.5. --- build-deploy-test.sh | 14 +++ .../feature.xml | 7 -- .../appengine-sdk-proxy.jar | Bin 15394 -> 15394 bytes .../properties/WebAppProjectProperties.java | 22 ++++ .../MavenProjectConfigurator.java | 33 +++++- .../icons/gwt_server_16x16.png | Bin 0 -> 785 bytes .../com.google.gdt.eclipse.suite/plugin.xml | 56 +++++------ .../google/gdt/eclipse/suite/GdtPlugin.java | 94 ++++++++---------- .../processors/XmxArgumentProcessor.java | 4 +- .../ui/shortcuts/WebAppLaunchShortcut.java | 12 +-- .../WebAppNoServerLaunchShortcut.java | 2 +- .../eclipse/suite/resources/GdtImages.java | 8 +- .../META-INF/MANIFEST.MF | 2 - .../icons/gwt_codeserver_16x16.png | Bin 0 -> 15161 bytes .../icons/gwt_server_16x16.png | Bin 0 -> 785 bytes .../com.google.gwt.eclipse.core/plugin.xml | 47 ++++++--- .../google/gwt/eclipse/core/GWTPlugin.java | 4 +- .../core/launch/ModuleClasspathProvider.java | 55 +++++----- .../ui/EntryPointModulesSelectionBlock.java | 28 ++---- .../GwtSuperDevModeCodeServerSettingsTab.java | 2 +- .../eclipse/core/modules/AbstractModule.java | 42 ++++++++ .../gwt/eclipse/core/modules/ModuleFile.java | 12 ++- .../gwt/eclipse/core/resources/GWTImages.java | 67 ++++--------- .../com.google.gwt.eclipse.libs/.classpath | 7 -- plugins/com.google.gwt.eclipse.libs/.project | 28 ------ .../META-INF/MANIFEST.MF | 10 -- .../build.properties | 5 - plugins/com.google.gwt.eclipse.libs/build.xml | 19 ---- .../libs/superdevmode-launcher-legacy.jar | Bin 84180 -> 0 bytes plugins/com.google.gwt.eclipse.libs/pom.xml | 15 --- .../libs/AboutSuperDevModeLegacyJar.java | 32 ------ .../lifecycle-mapping-metadata.xml | 16 +++ .../wtp/maven/GwtProjectConfigurator.java | 2 + repo/upload-test.sh | 14 +++ 34 files changed, 325 insertions(+), 334 deletions(-) create mode 100644 build-deploy-test.sh create mode 100644 plugins/com.google.gdt.eclipse.suite/icons/gwt_server_16x16.png create mode 100644 plugins/com.google.gwt.eclipse.core/icons/gwt_codeserver_16x16.png create mode 100644 plugins/com.google.gwt.eclipse.core/icons/gwt_server_16x16.png delete mode 100644 plugins/com.google.gwt.eclipse.libs/.classpath delete mode 100644 plugins/com.google.gwt.eclipse.libs/.project delete mode 100644 plugins/com.google.gwt.eclipse.libs/META-INF/MANIFEST.MF delete mode 100644 plugins/com.google.gwt.eclipse.libs/build.properties delete mode 100644 plugins/com.google.gwt.eclipse.libs/build.xml delete mode 100644 plugins/com.google.gwt.eclipse.libs/libs/superdevmode-launcher-legacy.jar delete mode 100644 plugins/com.google.gwt.eclipse.libs/pom.xml delete mode 100644 plugins/com.google.gwt.eclipse.libs/src/com/google/gwt/eclipse/libs/AboutSuperDevModeLegacyJar.java create mode 100644 repo/upload-test.sh diff --git a/build-deploy-test.sh b/build-deploy-test.sh new file mode 100644 index 00000000..a51edf5f --- /dev/null +++ b/build-deploy-test.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +# build plugin +mvn clean install + +#build mirror +cd mirrors +mvn clean install +cd .. + + +# upload +sh ./repo/upload-test.sh + diff --git a/features/com.google.gdt.eclipse.suite.e44.feature/feature.xml b/features/com.google.gdt.eclipse.suite.e44.feature/feature.xml index 8323c38e..4c52a637 100644 --- a/features/com.google.gdt.eclipse.suite.e44.feature/feature.xml +++ b/features/com.google.gdt.eclipse.suite.e44.feature/feature.xml @@ -250,13 +250,6 @@ version="0.0.0.qualifier" unpack="false"/> - - I9NHH*kF-#7$ir8$yd6EmFid7_!8Nw3DVF5X4@>ersu+U^3b2|tl&s-0}SYU1nVcayghcIL;+#!r~3m*t$yG0O$ g!E4zMVJxtm2w|97H9#0Ut@0rZ9qU>MW36>500}i{p8x;= delta 285 zcmZ2fv8aMCz?+$civa{CbiVhP$fwNG528&wAoM{w2>nUgWT?l{Xko4q!<{&7$yf=MQpaOV diff --git a/plugins/com.google.gdt.eclipse.core/src/com/google/gdt/eclipse/core/properties/WebAppProjectProperties.java b/plugins/com.google.gdt.eclipse.core/src/com/google/gdt/eclipse/core/properties/WebAppProjectProperties.java index 0ba04474..aaeefbb7 100644 --- a/plugins/com.google.gdt.eclipse.core/src/com/google/gdt/eclipse/core/properties/WebAppProjectProperties.java +++ b/plugins/com.google.gdt.eclipse.core/src/com/google/gdt/eclipse/core/properties/WebAppProjectProperties.java @@ -74,6 +74,11 @@ public interface IWarOutLocationChangedListener { */ private static final String GWT_MAVEN_MODULE_NAME = "gwtMavenModuleName"; + /** + * GWT Maven Plugin 2 ModuleName Short + */ + private static final String GWT_MAVEN_MODULE_SHORT_NAME = "gwtMavenModuleShortName"; + public static void addWarOutLocationChangedListener( IWarOutLocationChangedListener listener) { synchronized (warOutLocationChangedListeners) { @@ -246,6 +251,10 @@ public static String getGwtMavenModuleName(IProject project) { return getProjectProperties(project).get(GWT_MAVEN_MODULE_NAME, ""); } + public static String getGwtMavenModuleShortName(IProject project) { + return getProjectProperties(project).get(GWT_MAVEN_MODULE_SHORT_NAME, ""); + } + public static void setGwtMavenModuleName(IProject project, String gwtMavenModuleName) throws BackingStoreException { IEclipsePreferences prefs = getProjectProperties(project); if (gwtMavenModuleName == null) { @@ -260,6 +269,19 @@ public static void setGwtMavenModuleName(IProject project, String gwtMavenModule } } + public static void setGwtMavenModuleShortName(IProject project, String gwtMavenModuleShortName) throws BackingStoreException { + IEclipsePreferences prefs = getProjectProperties(project); + if (gwtMavenModuleShortName == null) { + try { + prefs.remove(GWT_MAVEN_MODULE_SHORT_NAME); + } catch (Exception e) { + e.printStackTrace(); + } + } else { + prefs.put(GWT_MAVEN_MODULE_SHORT_NAME, gwtMavenModuleShortName); + prefs.flush(); + } + } private WebAppProjectProperties() { // Not instantiable diff --git a/plugins/com.google.gdt.eclipse.maven/src/com/google/gdt/eclipse/maven/configurators/MavenProjectConfigurator.java b/plugins/com.google.gdt.eclipse.maven/src/com/google/gdt/eclipse/maven/configurators/MavenProjectConfigurator.java index 84f0795a..0c6f0312 100644 --- a/plugins/com.google.gdt.eclipse.maven/src/com/google/gdt/eclipse/maven/configurators/MavenProjectConfigurator.java +++ b/plugins/com.google.gdt.eclipse.maven/src/com/google/gdt/eclipse/maven/configurators/MavenProjectConfigurator.java @@ -59,7 +59,7 @@ public class MavenProjectConfigurator extends AbstracMavenProjectConfigurator { private static final String WEB_APP_DIRECTORY = "webappDirectory"; private static final String HOSTED_WEB_APP_DIRECTORY = "hostedWebapp"; // GWT Maven Plugin 1 only private static final String GWT_MAVEN_MODULENAME = "moduleName"; - + private static final String GWT_MAVEN_MODULESHORTNAME = "moduleShortName"; private static final String WAR_SRC_DIR_DEFAULT = "src/main/webapp"; @Override @@ -130,6 +130,7 @@ private void persistGwtNatureSettings(IProject project, MavenProject mavenProjec WebAppProjectProperties.setLastUsedWarOutLocation(project, warOutDir); WebAppProjectProperties.setGwtMavenModuleName(project, getGwtModuleName(mavenProject)); + WebAppProjectProperties.setGwtMavenModuleShortName(project, getGwtModuleShortName(mavenProject)); String message = "MavenProjectConfiguratior Maven: Success with setting up GWT Nature\n"; message += "\tartifactId=" + mavenProject.getArtifactId() + "\n"; @@ -168,6 +169,36 @@ private String getGwtModuleName(MavenProject mavenProject) { return moduleName; } + /** + * Get the GWT Maven plugin 2 . + * + * @param mavenProject + * @return the moduleName from configuration + */ + private String getGwtModuleShortName(MavenProject mavenProject) { + if (!isGwtMavenPlugin2(mavenProject)) { + return null; + } + + Plugin gwtPlugin2 = getGwtMavenPlugin2(mavenProject); + if (gwtPlugin2 == null) { + return null; + } + + Xpp3Dom gwtPluginConfig = (Xpp3Dom) gwtPlugin2.getConfiguration(); + if (gwtPluginConfig == null) { + return null; + } + + String moduleName = null; + for (Xpp3Dom child : gwtPluginConfig.getChildren()) { + if (child != null && GWT_MAVEN_MODULESHORTNAME.equals(child.getName())) { + moduleName = child.getValue().trim(); + } + } + return moduleName; + } + /** * Get the war output directory. * diff --git a/plugins/com.google.gdt.eclipse.suite/icons/gwt_server_16x16.png b/plugins/com.google.gdt.eclipse.suite/icons/gwt_server_16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..afd6dfab309a587b8d000529eb84c6bb43d5a72a GIT binary patch literal 785 zcmV+s1Md8ZP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv00000008+zyMF)x010qNS#tmY3labT3lag+-G2N400MPML_t(I%Y~CWOjJP> zhQFD)%U%`~P*4K|U&O=&mBdVAL<Fkx~$I9A*_4;3yfFQvpxwHc#ubf8rnrf=t$D zM(cUG==5=kjAKO%FY6NoK_I8Vt-uDL$