Release V3.0.0

- changed version to 3.0.0 for #399
- formatted sources, added missing copyright statements etc.
- updated update site location in features, closes #400

egradle-feature-core/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="de.jcup.egradle.eclipse.feature.core"
       label="EGradle Core"
-      version="2.8.0"
+      version="3.0.0"
       provider-name="Albert Tregnaghi"
       plugin="de.jcup.egradle.eclipse.plugin.branding">
 
@@ -83,7 +83,7 @@ END OF TERMS AND CONDITIONS
    </license>
 
    <url>
-      <update label="EGradle update site" url="https://dl.bintray.com/de-jcup/egradle/"/>
+      <update label="EGradle update site" url="https://github.com/de-jcup/update-site-egradle/tree/main/update-site"/>
    </url>
 
 

egradle-feature-editor/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="de.jcup.egradle.eclipse.feature.editor"
       label="EGradle Editor"
-      version="2.8.0"
+      version="3.0.0"
       provider-name="Albert Tregnaghi"
       plugin="de.jcup.egradle.eclipse.plugin.branding">
 
@@ -83,7 +83,7 @@ END OF TERMS AND CONDITIONS
    </license>
 
    <url>
-      <update label="EGradle update site" url="https://dl.bintray.com/de-jcup/egradle/"/>
+      <update label="EGradle update site" url="https://github.com/de-jcup/update-site-egradle/tree/main/update-site"/>
    </url>
 
    <includes

egradle-feature-ide/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="de.jcup.egradle.eclipse.feature"
       label="EGradle IDE"
-      version="2.8.0"
+      version="3.0.0"
       provider-name="Albert Tregnaghi"
       plugin="de.jcup.egradle.eclipse.plugin.branding">
 
@@ -83,7 +83,7 @@ END OF TERMS AND CONDITIONS
    </license>
 
    <url>
-      <update label="EGradle update site" url="https://dl.bintray.com/de-jcup/egradle/"/>
+      <update label="EGradle update site" url="https://github.com/de-jcup/update-site-egradle/tree/main/update-site"/>
    </url>
 
    <includes

egradle-feature-junit/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="de.jcup.egradle.eclipse.feature.junit"
       label="EGradle JUnit Integration"
-      version="2.8.0"
+      version="3.0.0"
       provider-name="Albert Tregnaghi"
       plugin="de.jcup.egradle.eclipse.plugin.branding">
 
@@ -81,15 +81,15 @@ END OF TERMS AND CONDITIONS
    </license>
 
    <url>
-      <update label="EGradle update site" url="https://dl.bintray.com/de-jcup/egradle/ "/>
+      <update label="EGradle update site" url="https://github.com/de-jcup/update-site-egradle/tree/main/update-site "/>
    </url>
 
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.jdt.core"/>
       <import plugin="org.eclipse.jdt.junit"/>
-      <import plugin="de.jcup.egradle.eclipse.plugin.main" version="2.8.0" match="greaterOrEqual"/>
+      <import plugin="de.jcup.egradle.eclipse.plugin.main" version="3.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>

egradle-plugin-branding/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EGradle
 Bundle-SymbolicName: de.jcup.egradle.eclipse.plugin.branding;singleton:=true
-Bundle-Version: 2.8.0
+Bundle-Version: 3.0.0
 Bundle-Vendor: Albert Tregnaghi

egradle-plugin-branding/about.html

@@ -6,7 +6,7 @@
 	<p>
 		<img alt="EGradle branding plugin" src="egradle-banner_128x128.png"></img>
 	</p>
-	<p>Version: 2.8.0</p>
+	<p>Version: 3.0.0</p>
 	<p>Copyright: Albert Tregnaghi</p>
 	<p>License: <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a><p>
 

egradle-plugin-branding/about.ini

@@ -1,5 +1,5 @@
 aboutText=EGradle\n\
-Version 2.8.0\n\
+Version 3.0.0\n\
 \n\
 License: Apache 2.0\n\
 Visit:   https://github.com/de-jcup/egradle

egradle-plugin-gradle-editor/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Egradle editor
 Bundle-SymbolicName: de.jcup.egradle.eclipse.plugin.editor.gradle;singleton:=true
-Bundle-Version: 2.8.0
+Bundle-Version: 3.0.0
 Bundle-Activator: de.jcup.egradle.eclipse.gradleeditor.EditorActivator
 Bundle-Vendor: Albert Tregnaghi
 Require-Bundle: org.eclipse.ui,
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.workbench,
  org.eclipse.ui.editors,
  org.eclipse.ui.ide,
- de.jcup.egradle.eclipse.plugin.main;bundle-version="2.8.0",
+ de.jcup.egradle.eclipse.plugin.main;bundle-version="3.0.0",
  de.jcup.egradle.eclipse.plugin.sdk
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

egradle-plugin-gradle-editor/about.html

@@ -6,7 +6,7 @@
 	<p>
 		<img alt="EGradle editor" src="egradle-banner_128x128.png"></img>
 	</p>
-	<p>Version: 2.8.0</p>
+	<p>Version: 3.0.0</p>
 	<p>Copyright: Albert Tregnaghi</p>
 	<p>License: <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a><p>
 

egradle-plugin-gradle-editor/src/main/java-eclipse/de/jcup/egradle/eclipse/gradleeditor/GradleSourceViewerConfiguration.java

@@ -104,10 +104,10 @@ public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceVie
         addPresentation(reconciler, ANNOTATION.getId(), getPreferences().getColor(COLOR_ANNOTATION), SWT.NONE);
         addPresentation(reconciler, GROOVY_DOC.getId(), getPreferences().getColor(COLOR_GROOVY_DOC), SWT.NONE);
         addPresentation(reconciler, GRADLE_APPLY_KEYWORD.getId(), getPreferences().getColor(COLOR_GRADLE_APPLY_KEYWORD), SWT.BOLD);
-        
+
         addPresentation(reconciler, GRADLE_KEYWORD.getId(), getPreferences().getColor(COLOR_GRADLE_OTHER_KEYWORD), SWT.BOLD);
         addPresentation(reconciler, GRADLE_DEPRECATED_KEYWORD.getId(), getPreferences().getColor(COLOR_GRADLE_DEPRECATED_KEYWORD), SWT.BOLD);
-        
+
         addPresentation(reconciler, GRADLE_TASK_KEYWORD.getId(), getPreferences().getColor(COLOR_GRADLE_TASK_KEYWORD), SWT.BOLD | SWT.ITALIC);
 
         addPresentation(reconciler, GRADLE_VARIABLE.getId(), getPreferences().getColor(COLOR_GRADLE_VARIABLE), SWT.ITALIC);

egradle-plugin-gradle-editor/src/main/java-eclipse/de/jcup/egradle/eclipse/gradleeditor/document/GradleDocumentIdentifiers.java

@@ -20,7 +20,7 @@
 public enum GradleDocumentIdentifiers implements DocumentIdentifier {
 
     GRADLE_KEYWORD,
-    
+
     GRADLE_DEPRECATED_KEYWORD,
 
     GRADLE_APPLY_KEYWORD,

egradle-plugin-gradle-editor/src/main/java-eclipse/de/jcup/egradle/eclipse/gradleeditor/document/keywords/GradleDefaultClosureKeyWords.java

@@ -22,13 +22,13 @@ public enum GradleDefaultClosureKeyWords implements DocumentKeyWord {
     IMPLEMENTATION("implementation"),
 
     TEST_IMPLEMENTATION("testImplementation"),
-    
+
     RUNTIME_ONLY("runtimeOnly"),
-    
+
     TEST_RUNTIME_ONLY("testRuntimeOnly"),
-    
+
     CLASSPATH("classpath"),
-    
+
     COPY("copy"),
 
     API("api"),
@@ -60,21 +60,19 @@ public enum GradleDefaultClosureKeyWords implements DocumentKeyWord {
     FILES("files"),
 
     FILETREE("fileTree"),
-    
+
     CONFIGURATIONS("configurations"),
-    
+
     /* wellknown */
     ASCIIDOCTORJ("asciidoctorj"),
 
     ASCIIDOCTOR("asciidoctor"),
 
-
     MODULES("modules"),
-    
+
     ATTRIBUTES("attributes"),
-
-    ;
 
+    ;
 
     private String text;
 

egradle-plugin-gradle-editor/src/main/java-eclipse/de/jcup/egradle/eclipse/gradleeditor/document/keywords/GradleDeprecatedKeyWords.java

@@ -19,18 +19,15 @@
 
 public enum GradleDeprecatedKeyWords implements DocumentKeyWord {
 
-
     // https://docs.gradle.org/current/userguide/upgrading_version_6.html#sec:configuration_removal
     COMPILE("compile"),
 
     RUNTIME("runtime"),
-    
+
     TEST_RUNTIME("testRuntime"),
 
     TEST_COMPILE("testCompile"),
-
-
-
+
     ;
 
     private String text;

egradle-plugin-gradle-editor/src/main/java-eclipse/de/jcup/egradle/eclipse/gradleeditor/document/keywords/GradleSpecialVariableKeyWords.java

@@ -22,7 +22,7 @@ public enum GradleSpecialVariableKeyWords implements DocumentKeyWord {
     LOGGER("logger"),
 
     LOGGING("logging"),
-    
+
     VERSION("version"),
 
     TASKS("tasks"),

egradle-plugin-ide/META-INF/MANIFEST.MF

@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.expressions,
  de.jcup.egradle.eclipse.plugin.branding;bundle-version="1.3.1",
  de.jcup.egradle.eclipse.plugin.editor.gradle;bundle-version="1.3.1",
- de.jcup.egradle.eclipse.plugin.main;bundle-version="2.8.0",
+ de.jcup.egradle.eclipse.plugin.main;bundle-version="3.0.0",
  de.jcup.egradle.eclipse.plugin.sdk;bundle-version="3.0.1",
  org.eclipse.team.core;bundle-version="3.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

egradle-plugin-ide/src/main/java-eclipse/de/jcup/egradle/eclipse/ide/IDEUtil.java

@@ -875,7 +875,7 @@ protected IStatus run(IProgressMonitor monitor) {
                     }
                     if (virtualRootProject instanceof IProject && EGradleIdePreferences.getInstance().isEGradleRootAlwaysAddedToWorkingSets()) {
                         WorkingSetSupport workingSetSupport = new WorkingSetSupport();
-                        workingSetSupport.addTofirstActiveWorkingSetWhenNotAlreadyInside((IProject)virtualRootProject);
+                        workingSetSupport.addTofirstActiveWorkingSetWhenNotAlreadyInside((IProject) virtualRootProject);
                     }
 
                     return Status.OK_STATUS;

egradle-plugin-ide/src/main/java-eclipse/de/jcup/egradle/eclipse/ide/WorkingSetSupport.java

@@ -31,30 +31,29 @@
 
 public class WorkingSetSupport {
 
-
     public void addTofirstActiveWorkingSetWhenNotAlreadyInside(IProject project) {
         IWorkingSetManager wm = getWorkingSetManager();
         IWorkingSet[] workingSets = wm.getAllWorkingSets();
-        
-        for (IWorkingSet workingSet:workingSets) {
+
+        for (IWorkingSet workingSet : workingSets) {
             IAdaptable[] elementsBefore = workingSet.getElements();
             List<IAdaptable> list = new ArrayList<IAdaptable>();
-            for (IAdaptable adaptable :elementsBefore) {
+            for (IAdaptable adaptable : elementsBefore) {
                 list.add(adaptable);
             }
             if (list.contains(project)) {
                 /* already added - ignore */
                 continue;
             }
             list.add(project);
-            
+
             /* add it */
             workingSet.setElements(list.toArray(new IAdaptable[list.size()]));
-            
+
         }
-        
+
     }
-    
+
     /**
      * Resolve working sets for given projects
      * 

egradle-plugin-ide/src/main/java-eclipse/de/jcup/egradle/eclipse/ide/preferences/EGradleFileHandlingPreferencePage.java

@@ -54,10 +54,9 @@ public void createFieldEditors() {
 
         addField(automaticalDeriveBuildFolders);
         SWTFactory.createLabel(getFieldEditorParent(), info, 2);
-
-
-        addVirtualRootToAllWorkingSets= new BooleanFieldEditor(EGradleIdePreferenceConstants.P_ALWAYS_ADD_VIRTUAL_ROOT_TO_ALL_WORKINGSETS.getId(), "Virtual root project is automatically added to all working sets",
-                getFieldEditorParent());
+
+        addVirtualRootToAllWorkingSets = new BooleanFieldEditor(EGradleIdePreferenceConstants.P_ALWAYS_ADD_VIRTUAL_ROOT_TO_ALL_WORKINGSETS.getId(),
+                "Virtual root project is automatically added to all working sets", getFieldEditorParent());
         String info2 = "(A new virtual root project is always added to all current working sets, so always visible)";
 
         addField(addVirtualRootToAllWorkingSets);

egradle-plugin-ide/src/main/java-eclipse/de/jcup/egradle/eclipse/ide/preferences/EGradleIdePreferenceConstants.java

@@ -24,30 +24,29 @@ public enum EGradleIdePreferenceConstants {
 
     P_GRADLE_USER_HOME("gradleUserHome"),
 
-    P_GRADLE_CALL_TYPE("gradleCallType"), 
-    
-    P_GRADLE_SHELL("commandShell"), 
-    
-    P_GRADLE_INSTALL_BIN_FOLDER("pathGradleInstallation"), 
-    
+    P_GRADLE_CALL_TYPE("gradleCallType"),
+
+    P_GRADLE_SHELL("commandShell"),
+
+    P_GRADLE_INSTALL_BIN_FOLDER("pathGradleInstallation"),
+
     P_GRADLE_CALL_COMMAND("commandGradle"),
-    
-    P_OUTPUT_VALIDATION_ENABLED("outputValidationEnabled"), 
-    
+
+    P_OUTPUT_VALIDATION_ENABLED("outputValidationEnabled"),
+
     P_SHOW_CONSOLE_VIEW_ON_BUILD_FAILED_ENABLED("showConsoleViewOnBuildfailed"),
 
     /* file handling parts */
     P_FILEHANDLING_AUTOMATICALLY_DERIVE_BUILDFOLDERS("automaticallyDeriveBuildFolders"),
 
     /* import */
-    P_IMPORT__EXECUTE_ASSEMBLE_TASK("onImportExecuteAssembleTask"), 
-    
+    P_IMPORT__EXECUTE_ASSEMBLE_TASK("onImportExecuteAssembleTask"),
+
     P_IMPORT__DO_CLEAN_PROJECTS("onImportDoCleanProjects"),
 
     P_DECORATION_SUBPROJECTS_WITH_ICON_ENABLED("decorateSubprojectsWithIconEnabled"),
-
-    P_ALWAYS_ADD_VIRTUAL_ROOT_TO_ALL_WORKINGSETS("alwaysAddVirtualRootToAllWorkingSets"),
-    ;
+
+    P_ALWAYS_ADD_VIRTUAL_ROOT_TO_ALL_WORKINGSETS("alwaysAddVirtualRootToAllWorkingSets"),;
 
     private String id;
 

egradle-plugin-ide/src/main/java-eclipse/de/jcup/egradle/eclipse/ide/preferences/EGradleIdePreferenceInitializer.java

@@ -49,7 +49,7 @@ public void initializeDefaultPreferences() {
         store.setDefault(P_GRADLE_CALL_COMMAND.getId(), defaultCallType.getDefaultGradleCommand());
 
         store.setDefault(P_MIGRATE_IDE_STATE.getId(), MigrationState.NOT_MIGRATED.name());
-        
+
         store.setDefault(P_ALWAYS_ADD_VIRTUAL_ROOT_TO_ALL_WORKINGSETS.getId(), true);
     }
 

egradle-plugin-ide/src/main/java-eclipse/de/jcup/egradle/eclipse/ide/preferences/EGradleIdePreferences.java

@@ -50,7 +50,7 @@ public String getStringPreference(EGradleIdePreferenceConstants id) {
     public IPreferenceStore getPreferenceStore() {
         return store;
     }
-    
+
     public boolean isEGradleRootAlwaysAddedToWorkingSets() {
         boolean showConsoleOnBuildFailed = getPreferenceStore().getBoolean(P_ALWAYS_ADD_VIRTUAL_ROOT_TO_ALL_WORKINGSETS.getId());
         return showConsoleOnBuildFailed;

egradle-plugin-ide/src/main/java-eclipse/de/jcup/egradle/eclipse/ide/wizards/EGradleNewProjectWizard.java

@@ -66,14 +66,14 @@ public EGradleNewProjectWizard() {
 
         context = new NewProjectContext();
         context.setMultiProjects(defaultMultiProjects);
-        
+
         setWindowTitle("New Gradle Project");
     }
 
     @Override
     public void init(IWorkbench workbench, IStructuredSelection selection) {
     }
-    
+
     @Override
     public void addPages() {
 
@@ -84,11 +84,11 @@ public void addPages() {
         addPage(mainPage);
         addPage(templateSelectionPage);
         addPage(templateDetailsPage);
-        
+
         mainPage.setPageComplete(false);
         templateSelectionPage.setPageComplete(false);
     }
-    
+
     @Override
     public boolean performFinish() {
         showProblem(null);