Final steps for release 3.1.0 #414

- added missing copyright headers - formatted source code - organized imports - updated site.xml
de-jcup · Mar 14, 2022 · 7e521c0 · 7e521c0
1 parent 68d72a2
commit 7e521c0
Show file tree

Hide file tree

Showing 26 changed files with 89 additions and 85 deletions.
diff --git a/egradle-feature-core/feature.xml b/egradle-feature-core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.jcup.egradle.eclipse.feature.core"
       label="EGradle Core"
-      version="3.0.0"
+      version="3.1.0"
       provider-name="Albert Tregnaghi"
       plugin="de.jcup.egradle.eclipse.plugin.branding">
 

diff --git a/egradle-feature-editor/feature.xml b/egradle-feature-editor/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.jcup.egradle.eclipse.feature.editor"
       label="EGradle Editor"
-      version="3.0.0"
+      version="3.1.0"
       provider-name="Albert Tregnaghi"
       plugin="de.jcup.egradle.eclipse.plugin.branding">
 

diff --git a/egradle-feature-ide/feature.xml b/egradle-feature-ide/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.jcup.egradle.eclipse.feature"
       label="EGradle IDE"
-      version="3.0.0"
+      version="3.1.0"
       provider-name="Albert Tregnaghi"
       plugin="de.jcup.egradle.eclipse.plugin.branding">
 

diff --git a/egradle-feature-junit/feature.xml b/egradle-feature-junit/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.jcup.egradle.eclipse.feature.junit"
       label="EGradle JUnit Integration"
-      version="3.0.0"
+      version="3.1.0"
       provider-name="Albert Tregnaghi"
       plugin="de.jcup.egradle.eclipse.plugin.branding">
 
@@ -89,7 +89,7 @@ END OF TERMS AND CONDITIONS
       <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="3.0.0" match="greaterOrEqual"/>
+      <import plugin="de.jcup.egradle.eclipse.plugin.main" version="3.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>

diff --git a/egradle-plugin-branding/META-INF/MANIFEST.MF b/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: 3.0.0
+Bundle-Version: 3.1.0
 Bundle-Vendor: Albert Tregnaghi
diff --git a/egradle-plugin-branding/about.html b/egradle-plugin-branding/about.html
@@ -6,7 +6,7 @@
 	<p>
 		<img alt="EGradle branding plugin" src="egradle-banner_128x128.png"></img>
 	</p>
-	<p>Version: 3.0.0</p>
+	<p>Version: 3.1.0</p>
 	<p>Copyright: Albert Tregnaghi</p>
 	<p>License: <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a><p>
 

diff --git a/egradle-plugin-branding/about.ini b/egradle-plugin-branding/about.ini
@@ -1,5 +1,5 @@
 aboutText=EGradle\n\
-Version 3.0.0\n\
+Version 3.1.0\n\
 \n\
 License: Apache 2.0\n\
 Visit:   https://github.com/de-jcup/egradle

diff --git a/egradle-plugin-gradle-editor/META-INF/MANIFEST.MF b/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: 3.0.0
+Bundle-Version: 3.1.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="3.0.0",
+ de.jcup.egradle.eclipse.plugin.main;bundle-version="3.1.0",
  de.jcup.egradle.eclipse.plugin.sdk
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

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

diff --git a/...ipse/de/jcup/egradle/eclipse/gradleeditor/document/keywords/GradleDeprecatedKeyWords.java b/...ipse/de/jcup/egradle/eclipse/gradleeditor/document/keywords/GradleDeprecatedKeyWords.java
@@ -27,9 +27,9 @@ public enum GradleDeprecatedKeyWords implements DocumentKeyWord {
     TEST_RUNTIME("testRuntime"),
 
     TEST_COMPILE("testCompile"),
-    
+
     COMPILE_JAVA("compileJava"),
-    
+
     COMPILE_TEST_JAVA("compileTestJava"),
 
     ;

diff --git a/egradle-plugin-ide/META-INF/MANIFEST.MF b/egradle-plugin-ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EGradle IDE
 Bundle-SymbolicName: de.jcup.egradle.eclipse.plugin.ide;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.1.0
 Bundle-Activator: de.jcup.egradle.eclipse.ide.IDEActivator
 Bundle-Vendor: Albert Tregnaghi
 Require-Bundle: org.eclipse.ui,
@@ -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="3.0.0",
+ de.jcup.egradle.eclipse.plugin.main;bundle-version="3.1.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

diff --git a/egradle-plugin-ide/src/main/java-eclipse/de/jcup/egradle/eclipse/ide/IDEUtil.java b/egradle-plugin-ide/src/main/java-eclipse/de/jcup/egradle/eclipse/ide/IDEUtil.java
@@ -137,10 +137,10 @@ public static ProjectContext getAllEclipseProjectsInCurrentGradleRootProject() {
         }
         return context;
     }
-    
-    public static ProjectContext createProjectContext(IProject ...projects) {
+
+    public static ProjectContext createProjectContext(IProject... projects) {
         ProjectContext context = new ProjectContext();
-        for (IProject project: projects) {
+        for (IProject project : projects) {
             context.getProjects().add(project);
         }
         return context;

diff --git a/.../main/java-eclipse/de/jcup/egradle/eclipse/ide/console/EGradleConsoleColorsConstants.java b/.../main/java-eclipse/de/jcup/egradle/eclipse/ide/console/EGradleConsoleColorsConstants.java
@@ -23,30 +23,28 @@ public class EGradleConsoleColorsConstants {
     public static final RGB RED = new RGB(170, 0, 0);
     public static final RGB GREEN = new RGB(0, 170, 0);
     public static final RGB BROWN = new RGB(170, 85, 0);
-
-
-    public static final RGB STEEL_BLUE = new RGB(70,130,180);// https://www.rapidtables.com/web/color/blue-color.html
-    public static final RGB MEDIUM_BLUE = new RGB(0,0,205);// https://www.rapidtables.com/web/color/blue-color.html
+
+    public static final RGB STEEL_BLUE = new RGB(70, 130, 180);// https://www.rapidtables.com/web/color/blue-color.html
+    public static final RGB MEDIUM_BLUE = new RGB(0, 0, 205);// https://www.rapidtables.com/web/color/blue-color.html
     public static final RGB BLUE = new RGB(0, 0, 170);
-    public static final RGB ROYAL_BLUE = new RGB(65,105,225);// https://www.rapidtables.com/web/color/blue-color.html
+    public static final RGB ROYAL_BLUE = new RGB(65, 105, 225);// https://www.rapidtables.com/web/color/blue-color.html
     public static final RGB BRIGHT_BLUE = new RGB(85, 85, 255);
-
-
+
     public static final RGB MAGENTA = new RGB(170, 0, 170);
     public static final RGB CYANN = new RGB(0, 170, 170);
     public static final RGB GRAY = new RGB(170, 170, 170);
-    
+
     public static final RGB DARK_GRAY = new RGB(85, 85, 85);
-    public static final RGB MEDIUM_GRAY = new RGB(165,165,165);
-    
+    public static final RGB MEDIUM_GRAY = new RGB(165, 165, 165);
+
     public static final RGB BRIGHT_RED = new RGB(255, 85, 85);
     public static final RGB BRIGHT_GREEN = new RGB(85, 255, 85);
     public static final RGB YELLOW = new RGB(255, 255, 85);
-    
+
     public static final RGB ORANGE = new RGB(255, 165, 0); // http://www.rapidtables.com/web/color/orange-color.htm
     public static final RGB DARK_ORANGE = new RGB(255, 140, 0); // http://www.rapidtables.com/web/color/orange-color.htm
-    public static final RGB VERY_DARK_ORANGE = new RGB(205, 90, 0); 
-    
+    public static final RGB VERY_DARK_ORANGE = new RGB(205, 90, 0);
+
     public static final RGB TASK_BLUE = new RGB(93, 138, 168);
     public static final RGB BRIGHT_MAGENTA = new RGB(255, 85, 255);
 

diff --git a/...rc/main/java-eclipse/de/jcup/egradle/eclipse/ide/console/EGradleConsoleStyleListener.java b/...rc/main/java-eclipse/de/jcup/egradle/eclipse/ide/console/EGradleConsoleStyleListener.java
@@ -101,7 +101,7 @@ public void lineGetStyle(LineStyleEvent event) {
         /* line text */
         markBetween(event, lineText, ranges, "'", "'", getColor(EGradleConsoleColorsConstants.DARK_ORANGE), false);
         markBetween(event, lineText, ranges, "<", ">", getColor(EGradleConsoleColorsConstants.TASK_BLUE), false);
-        markBetween(event, lineText, ranges, "\"", "\"",  getColor(EGradleConsoleColorsConstants.CYANN), false);
+        markBetween(event, lineText, ranges, "\"", "\"", getColor(EGradleConsoleColorsConstants.CYANN), false);
 
         if (!handled) {
             if (StringUtils.containsOnly(lineText, "-")) {

diff --git a/.../src/main/java-eclipse/de/jcup/egradle/eclipse/ide/execution/GradleExecutionDelegate.java b/.../src/main/java-eclipse/de/jcup/egradle/eclipse/ide/execution/GradleExecutionDelegate.java
@@ -24,8 +24,8 @@
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 
-import de.jcup.egradle.core.GradleExecutor;
 import de.jcup.egradle.core.DateUtils;
+import de.jcup.egradle.core.GradleExecutor;
 import de.jcup.egradle.core.ProcessExecutionResult;
 import de.jcup.egradle.core.config.MutableGradleConfiguration;
 import de.jcup.egradle.core.domain.GradleContext;
@@ -48,7 +48,7 @@
  */
 public class GradleExecutionDelegate {
 
-     private GradleContext context;
+    private GradleContext context;
     private OutputHandler outputHandler;
     private ProcessExecutionResult processExecutionResult;
     protected GradleExecutor executor;
@@ -145,7 +145,7 @@ public void execute(IProgressMonitor monitor) throws Exception {
         try {
             GradleRootProject rootProject = context.getRootProject();
             String commandString = context.getCommandString();
-            String progressDescription = "Executing gradle command '" + commandString + "' in \"" + context.getRootProject().getFolder().getAbsolutePath()+"\"";
+            String progressDescription = "Executing gradle command '" + commandString + "' in \"" + context.getRootProject().getFolder().getAbsolutePath() + "\"";
 
             File folder = rootProject.getFolder();
             String rootProjectFolderName = folder.getName();

diff --git a/...clipse/de/jcup/egradle/eclipse/ide/handlers/RefreshProjectEclipseDependenciesHandler.java b/...clipse/de/jcup/egradle/eclipse/ide/handlers/RefreshProjectEclipseDependenciesHandler.java
@@ -38,7 +38,7 @@ public class RefreshProjectEclipseDependenciesHandler extends AbstractEGradleCom
     private IProject projectToUse;
 
     private SelectedProjectFinder projectFinder = new SelectedProjectFinder();
-    
+
     public Object execute(ExecutionEvent event) throws ExecutionException {
         Shell activeWorkbenchShell = EclipseUtil.getActiveWorkbenchShell();
         if (activeWorkbenchShell == null) {
@@ -52,7 +52,6 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
         return super.execute(event);
     }
 
-
     @Override
     public void prepare(GradleContext context) {
         if (projectToUse == null) {
@@ -62,7 +61,7 @@ public void prepare(GradleContext context) {
         StringBuilder sb = new StringBuilder();
         if (!hasVirtualRootProjectNature(projectToUse) && !isRootProject(projectToUse)) {
             sb.append(":");
-            sb.append(projectToUse.getName()); 
+            sb.append(projectToUse.getName());
             sb.append(":");
         }
         sb.append("cleanEclipse eclipse");

diff --git a/egradle-plugin-junit-contribution/META-INF/MANIFEST.MF b/egradle-plugin-junit-contribution/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EGradle JUnit contribution
 Bundle-SymbolicName: de.jcup.egradle.eclipse.plugin.junit.contribution;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.1.0
 Bundle-Activator: de.jcup.egradle.eclipse.junit.contribution.JUnitActivator
 Bundle-Vendor: Albert Tregnaghi
 Require-Bundle: org.eclipse.ui,
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
  org.eclipse.jdt.ui,
- de.jcup.egradle.eclipse.plugin.main;bundle-version="3.0.0",
+ de.jcup.egradle.eclipse.plugin.main;bundle-version="3.1.0",
  de.jcup.egradle.eclipse.plugin.ide
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

diff --git a/egradle-plugin-junit-contribution/about.html b/egradle-plugin-junit-contribution/about.html
@@ -6,7 +6,7 @@
 	<p>
 		<img alt="EGradle junit contribution plugin" src="egradle-banner_128x128.png"></img>
 	</p>
-	<p>Version: 3.0.0</p>
+	<p>Version: 3.1.0</p>
 	<p>Copyright: Albert Tregnaghi</p>
 	<p>License: <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a><p>
 

diff --git a/egradle-plugin-main/META-INF/MANIFEST.MF b/egradle-plugin-main/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EGradle
 Bundle-SymbolicName: de.jcup.egradle.eclipse.plugin.main;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.1.0
 Bundle-Activator: de.jcup.egradle.eclipse.MainActivator
 Bundle-Vendor: Albert Tregnaghi
 Require-Bundle: org.eclipse.ui,

diff --git a/egradle-plugin-main/about.html b/egradle-plugin-main/about.html
@@ -6,7 +6,7 @@
 	<p>
 		<img alt="EGradle main plugin" src="icons/egradle-banner_128x128.png"></img>
 	</p>
-	<p>Version: 3.0.0</p>
+	<p>Version: 3.1.0</p>
 	<p>Copyright: Albert Tregnaghi</p>
 	<p>License: <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a><p>
 

diff --git a/...n-main/src/main/java-eclipse/de/jcup/egradle/eclipse/document/ClosureKeyWordDetector.java b/...n-main/src/main/java-eclipse/de/jcup/egradle/eclipse/document/ClosureKeyWordDetector.java
@@ -32,7 +32,7 @@ public boolean isWordPart(char c) {
         if (Character.isWhitespace(c)) {
             return false;
         }
-        if (c=='_') {// we allow _ so "api_" detects not "api" only but "api_" , means different
+        if (c == '_') {// we allow _ so "api_" detects not "api" only but "api_" , means different
             return true;
         }
         if (!Character.isLetter(c)) {

diff --git a/...ain/src/main/java-eclipse/de/jcup/egradle/eclipse/ui/GroovyBracketInsertionCompleter.java b/...ain/src/main/java-eclipse/de/jcup/egradle/eclipse/ui/GroovyBracketInsertionCompleter.java
@@ -82,21 +82,21 @@ public void keyReleased(KeyEvent e) {
             EclipseUtil.logError("Cannot get contentType", ex);
             return;
         }
-        if (offset >1){
-			try {
-				String charBeforBracket = document.get(offset - 2, 1);
-				if (charBeforBracket.equals("$") && e.character == '{') {
-					document.replace(offset , 0, "}");
-					selectionProvider.setSelection(new TextSelection(offset, 0));
-					return;
-				}
-			} catch (BadLocationException e2) {
-	            EclipseUtil.logError("Cannot set ${}", e2);
-	            return;
-			}
+        if (offset > 1) {
+            try {
+                String charBeforBracket = document.get(offset - 2, 1);
+                if (charBeforBracket.equals("$") && e.character == '{') {
+                    document.replace(offset, 0, "}");
+                    selectionProvider.setSelection(new TextSelection(offset, 0));
+                    return;
+                }
+            } catch (BadLocationException e2) {
+                EclipseUtil.logError("Cannot set ${}", e2);
+                return;
+            }
         }
-      
-		EclipseUtil.safeAsyncExec(new Runnable() {
+
+        EclipseUtil.safeAsyncExec(new Runnable() {
 
             @Override
             public void run() {

diff --git a/...ugin-main/src/main/java-eclipse/de/jcup/egradle/eclipse/ui/SelectConfigurationDialog.java b/...ugin-main/src/main/java-eclipse/de/jcup/egradle/eclipse/ui/SelectConfigurationDialog.java
@@ -204,22 +204,20 @@ private void createContents(final Shell shell) {
         final Combo combo = new Combo(shell, SWT.NONE);
         combo.setBounds(50, 50, 150, 65);
 
-        /* @formatter:on */
-        String items[] = { 
-                "", 
-                "archives",
-                "compileClasspath",
-                "compileOnly",
-                "implementation",
-                "runtimeClasspath",
-                "runtimeOnly",
-                "testCompileClasspath",
-                "testCompileOnly",
-                "testImplementation",
-                "testRuntimeClasspath",
-                "testRuntimeOnly" 
-                };
         /* @formatter:off */
+        String items[] = { "", 
+                "archives", 
+                "compileClasspath", 
+                "compileOnly", 
+                "implementation", 
+                "runtimeClasspath", 
+                "runtimeOnly", 
+                "testCompileClasspath", 
+                "testCompileOnly", 
+                "testImplementation",
+                "testRuntimeClasspath", 
+                "testRuntimeOnly" };
+                /* @formatter:on */
 
         combo.setItems(items);