refresh project

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/DSLDElementListener.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2009-2017 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -56,5 +56,4 @@ private boolean isResolvedClasspathChangeNotRawClasspath(IJavaElementDelta delta
         return (delta.getFlags() & IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED) != 0 &&
                 (delta.getFlags() & IJavaElementDelta.F_CLASSPATH_CHANGED) == 0;
     }
-
 }

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/DSLDResourceListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2019 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/DSLDStore.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2009-2017 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/DSLDStoreManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2020 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/DSLPreferences.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2019 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package org.codehaus.groovy.eclipse.dsl;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -46,12 +47,7 @@ public static String[] getDisabledScripts() {
     }
 
     public static Set<String> getDisabledScriptsAsSet() {
-        String[] disabled = getDisabledScripts();
-        Set<String> set = new HashSet<>(disabled.length*2);
-        for (String dis : disabled) {
-            set.add(dis);
-        }
-        return set;
+        return new HashSet<>(Arrays.asList(getDisabledScripts()));
     }
 
     /**
@@ -71,24 +67,25 @@ private static String join(String[] filtered) {
                 sb.append(s);
                 sb.append(',');
             }
-            sb.replace(sb.length()-1, sb.length(), "");
+            sb.replace(sb.length() - 1, sb.length(), "");
             return sb.toString();
         } else {
             return "";
         }
     }
 
     private static String[] filter(String[] disabled) {
-        // not working now
-//        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-//        List<String> filtered = new ArrayList<String>(disabled.length);
-//        for (String string : disabled) {
-//            IResource r = root.getFile(new Path(string));
-//            if (r.getType() == IResource.FILE && r.isAccessible()) {
-//                filtered.add(string);
-//            }
-//        }
-//        return filtered.toArray(new String[filtered.size()]);
+        /* not working now
+        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+        List<String> filtered = new ArrayList<String>(disabled.length);
+        for (String string : disabled) {
+            IResource r = root.getFile(new Path(string));
+            if (r.getType() == IResource.FILE && r.isAccessible()) {
+                filtered.add(string);
+            }
+        }
+        return filtered.toArray(new String[filtered.size()]);
+        */
         return disabled;
     }
 }

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/DSLPreferencesInitializer.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2009-2017 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/DisabledScriptsCache.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2019 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/GroovyDSLCoreActivator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2020 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/RefreshDSLDJob.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2020 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/checker/IStaticCheckerHandler.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2009-2017 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/checker/ResourceMarkerHandler.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2009-2017 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -33,7 +33,7 @@ public class ResourceMarkerHandler implements IStaticCheckerHandler {
 
     private IFile resource;
 
-    private int numFound = 0;
+    private int numFound;
 
     @Override
     public void setResource(IFile resource) {

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/checker/ResourceTypeChecker.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2009-2017 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -44,6 +44,55 @@
  */
 public class ResourceTypeChecker {
 
+    private final IStaticCheckerHandler handler;
+    private final List<IResource> resources;
+
+    protected boolean onlyAssertions;
+    protected final char[][] includes;
+    protected final char[][] excludes;
+
+    public ResourceTypeChecker(IStaticCheckerHandler handler, String projectName, char[][] includes, char[][] excludes, boolean onlyAssertions) {
+        this(handler, createProject(projectName), includes, excludes, onlyAssertions);
+    }
+
+    public ResourceTypeChecker(IStaticCheckerHandler handler, List<IResource> resources, char[][] includes, char[][] excludes, boolean onlyAssertions) {
+        this.handler = handler;
+        this.resources = resources;
+        this.includes = includes;
+        this.excludes = excludes;
+        this.onlyAssertions = onlyAssertions;
+    }
+
+    private static List<IResource> createProject(String projectName) {
+        IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+        if (!GroovyNature.hasGroovyNature(project)) {
+            throw new IllegalArgumentException("Invalid project: " + projectName);
+        }
+        return Collections.<IResource>singletonList(project);
+    }
+
+    /**
+     * Performs the tpe checking on the selected resources.
+     * @param monitor progress monitor, can be null
+     * @return true iff no type problems were found
+     * @throws CoreException
+     */
+    public boolean doCheck(IProgressMonitor monitor) throws CoreException {
+        if (monitor == null) {
+            monitor = new NullProgressMonitor();
+        }
+        monitor.beginTask("Static type analysis", resources.size());
+        for (IResource resource : resources) {
+            if (monitor.isCanceled()) {
+                throw new OperationCanceledException();
+            }
+            CheckerVisitor visitor = new CheckerVisitor(monitor);
+            resource.accept(visitor);
+            monitor.worked(1);
+        }
+        return handler.finish(null);
+    }
+
     class CheckerVisitor implements IResourceVisitor {
         private IProgressMonitor monitor;
 
@@ -105,7 +154,7 @@ private Map<Integer, String> findComments(GroovyCompilationUnit unit) {
                 String candidate;
                 if (stok.hasMoreTokens() && (candidate = stok.nextToken()).startsWith("TYPE:")) {
                     // may or may not have a space after the colon
-                    if (candidate.equals("TYPE:")) {
+                    if ("TYPE:".equals(candidate)) {
                         if (stok.hasMoreTokens()) {
                             type = stok.nextToken();
                         }
@@ -121,53 +170,4 @@ private Map<Integer, String> findComments(GroovyCompilationUnit unit) {
             return allComments;
         }
     }
-
-    private final IStaticCheckerHandler handler;
-    private final List<IResource> resources;
-
-    protected boolean onlyAssertions;
-    protected final char[][] includes;
-    protected final char[][] excludes;
-
-    public ResourceTypeChecker(IStaticCheckerHandler handler, String projectName, char[][] includes, char[][] excludes, boolean onlyAssertions) {
-        this(handler, createProject(projectName), includes, excludes, onlyAssertions);
-    }
-
-    public ResourceTypeChecker(IStaticCheckerHandler handler, List<IResource> resources, char[][] includes, char[][] excludes, boolean onlyAssertions) {
-        this.handler = handler;
-        this.resources = resources;
-        this.includes = includes;
-        this.excludes = excludes;
-        this.onlyAssertions = onlyAssertions;
-    }
-
-    private static List<IResource> createProject(String projectName) {
-        IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-        if (!GroovyNature.hasGroovyNature(project)) {
-            throw new IllegalArgumentException("Invalid project: " + projectName);
-        }
-        return Collections.<IResource>singletonList(project);
-    }
-
-    /**
-     * Performs the tpe checking on the selected resources.
-     * @param monitor progress monitor, can be null
-     * @return true iff no type problems were found
-     * @throws CoreException
-     */
-    public boolean doCheck(IProgressMonitor monitor) throws CoreException {
-        if (monitor == null) {
-            monitor = new NullProgressMonitor();
-        }
-        monitor.beginTask("Static type analysis", resources.size());
-        for (IResource resource : resources) {
-            if (monitor.isCanceled()) {
-                throw new OperationCanceledException();
-            }
-            CheckerVisitor visitor = new CheckerVisitor(monitor);
-            resource.accept(visitor);
-            monitor.worked(1);
-        }
-        return handler.finish(null);
-    }
 }

ide/org.codehaus.groovy.eclipse.dsl/src/org/codehaus/groovy/eclipse/dsl/checker/StaticCheckerApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2019 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -142,40 +142,40 @@ private void processCommandLine(String[] args) {
 
         for (int i = 0; i < args.length; i += 1) {
             String arg = args[i];
-            if (arg.equals("-h") || arg.equals("--help")) {
+            if ("-h".equals(arg) || "--help".equals(arg)) {
                 doHelp = true;
                 break;
-            } else if (arg.equals("--assertions_only")) {
+            } else if ("--assertions_only".equals(arg)) {
                 assertionsOnly = true;
-            } else if (arg.equals("--excludes")) {
+            } else if ("--excludes".equals(arg)) {
                 if (i == args.length - 1) {
                     System.err.println("Missing --excludes argument");
                     doHelp = true;
                     break;
                 }
                 excludes = args[++i];
-            } else if (arg.equals("--includes")) {
+            } else if ("--includes".equals(arg)) {
                 if (i == args.length - 1) {
                     System.err.println("Missing --includes argument");
                     doHelp = true;
                     break;
                 }
                 includes = args[++i];
-            } else if (arg.equals("--extra_dslds")) {
+            } else if ("--extra_dslds".equals(arg)) {
                 if (i == args.length - 1) {
                     System.err.println("Missing --extraDslds argument");
                     doHelp = true;
                     break;
                 }
                 extraDslds = args[++i].split("\\|");
-            } else if (arg.equals("--project_path")) {
+            } else if ("--project_path".equals(arg)) {
                 if (i == args.length - 1) {
                     System.err.println("Missing --project_path argument");
                     doHelp = true;
                     break;
                 }
                 projectFolderPath = args[++i];
-            } else if (arg.equals("--result_file")) {
+            } else if ("--result_file".equals(arg)) {
                 if (i == args.length - 1) {
                     System.err.println("Missing --result_file argument");
                     doHelp = true;
@@ -212,7 +212,8 @@ private void printUsage(boolean isInvalid) {
         }
 
         System.out.println("Usage:");
-        System.out.println("eclipse -application org.codehause.groovy.eclipse.staticCheck [--help] [-h] [--extra_dslds <FILES>] [--assertions_only] [--excludes <PATH>] [--includes <PATH>] [--project_path <PATH>] <PROJECT_NAME>");
+        System.out.println("eclipse -application org.codehause.groovy.eclipse.staticCheck" +
+            " [--help] [-h] [--extra_dslds <FILES>] [--assertions_only] [--excludes <PATH>] [--includes <PATH>] [--project_path <PATH>] <PROJECT_NAME>");
         System.out.println("where:");
         System.out.println("\t--help OR -h  Print this message and exit.");
         System.out.println("\t--extra_dslds  list of extra dsld files to be included in this check.  Use '|' as a file separator.");
@@ -223,7 +224,9 @@ private void printUsage(boolean isInvalid) {
         System.out.println("\t--result_file  File to send static checking results to.  If not specified, then results sent to sysout.");
         System.out.println("\t<PROJECT_NAME>  Name of a project to type check.  If not already in workspace, then must also use '--project_path'.");
         System.out.println();
-        System.out.println("Ant style filters are allowed.  Eg, src/org/codehaus/groovy/**/*.groovy means all files with groovy extensions in the org.codehaus.groovy package or below will be ex/included   Filters can be concentenated using '|'.");
+        System.out.println("Ant style filters are allowed." +
+            "  For example, src/org/codehaus/groovy/**/*.groovy means all files with groovy extensions in the org.codehaus.groovy tree will be ex/included." +
+            "  Filters can be concentenated using '|'.");
     }
 
     private void removeExtraDslds() {