Fixed ClassCastException when adding module file (#453)

Fixed ClassCastException when adding module file

Author: protoism

plugins/com.gwtplugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/dialogs/ModuleSelectionDialog.java

@@ -55,7 +55,7 @@ public class ModuleSelectionDialog extends FilteredItemsSelectionDialog {
 
   /**
    * A label provider for details of IModule objects.
-   * 
+   *
    * This code was adapted from the
    * FilteredTypesSelectionDialog.TypeItemDetailsLabelProvider class.
    */
@@ -70,7 +70,7 @@ public Image getImage(Object element) {
       Image image = null;
 
       IModule module = (IModule) element;
-      if (!module.isBinary()) {
+      if (module instanceof ModuleFile) {
         ModuleFile moduleFile = (ModuleFile) module;
         IFile file = moduleFile.getFile();
         IPackageFragment pkFrag;
@@ -101,7 +101,7 @@ public String getText(Object element) {
       IModule module = (IModule) element;
       String packageName = module.getPackageName();
 
-      if (!module.isBinary()) {
+      if (module instanceof ModuleFile) {
         ModuleFile moduleFile = (ModuleFile) module;
         IFile file = moduleFile.getFile();
         String modulePath = file.getFullPath().makeRelative().toString();
@@ -119,7 +119,7 @@ public String getText(Object element) {
 
   /**
    * A label provider for IModule objects.
-   * 
+   *
    * This code was adapted from the
    * FilteredTypesSelectionDialog.TypeItemLabelProvider class.
    */
@@ -279,7 +279,7 @@ private boolean matchesPackage(IModule module) {
 
   /**
    * Extends functionality of SearchPatterns.
-   * 
+   *
    * This code was adapted from the
    * FilteredTypesSelectionDialog.TypeSearchPattern class.
    */
@@ -341,12 +341,12 @@ private String evaluatePackagePattern(String s) {
 
   /**
    * Create a new ModuleSelectionDialog and display it.
-   * 
+   *
    * @param shell The current display shell
    * @param project The Java project that should be searched for GWT Modules
    * @param showModulesInJars true if modules that are located in jars on the
    *          project's classpath should be displayed
-   * 
+   *
    * @return the IModule corresponding to the module chosen from the list by
    *         pressing the OK button, null if CANCEL was pressed.
    */
@@ -366,25 +366,25 @@ public static IModule show(Shell shell, IJavaProject project,
 
   /**
    * Helper method to return the absolute workspace path of a GWT Module.
-   * 
+   *
    * If the module file is located in a JAR, then the absolute path of the JAR
    * on the file system is returned.
    */
   private static IPath getPathForModule(IModule module) {
 
-    if (module == null) {
-      return null;
-    }
-
-    if (!module.isBinary()) {
+    if (module instanceof ModuleFile) {
       ModuleFile moduleFile = (ModuleFile) module;
       IFile file = moduleFile.getFile();
       return file.getFullPath();
     }
-
-    ModuleJarResource moduleJarResource = (ModuleJarResource) module;
-    IJarEntryResource jarEntryResource = moduleJarResource.getJarEntryResource();
-    return jarEntryResource.getPackageFragmentRoot().getPath();
+    else if(module instanceof ModuleJarResource) {
+      ModuleJarResource moduleJarResource = (ModuleJarResource) module;
+      IJarEntryResource jarEntryResource = moduleJarResource.getJarEntryResource();
+      return jarEntryResource.getPackageFragmentRoot().getPath();
+    }
+    else {
+      return null;
+    }
   }
 
   private IJavaProject javaProject;
@@ -448,40 +448,36 @@ protected IDialogSettings getDialogSettings() {
   }
 
   @Override
-  protected Comparator<?> getItemsComparator() {
-    return new Comparator<Object>() {
-      public int compare(Object o1, Object o2) {
-        Collator collator = Collator.getInstance();
-        IModule module1 = (IModule) o1;
-        IModule module2 = (IModule) o2;
-
-        // Compare module names
+  protected Comparator<IModule> getItemsComparator() {
+    return (IModule module1, IModule module2) -> {
+      Collator collator = Collator.getInstance();
 
-        String s1 = module1.getSimpleName();
-        String s2 = module2.getSimpleName();
+      // Compare module names
 
-        int comparability = collator.compare(s1, s2);
+      String s1 = module1.getSimpleName();
+      String s2 = module2.getSimpleName();
 
-        // If module names are identical, then compare
-        // fully-qualified module names
+      int comparability = collator.compare(s1, s2);
 
-        if (comparability == 0) {
-          s1 = module1.getQualifiedName();
-          s2 = module2.getQualifiedName();
-          comparability = collator.compare(s1, s2);
-        }
+      // If module names are identical, then compare
+      // fully-qualified module names
 
-        // If fully-qualified module names are identical, then
-        // compare file paths.
+      if (comparability == 0) {
+        s1 = module1.getQualifiedName();
+        s2 = module2.getQualifiedName();
+        comparability = collator.compare(s1, s2);
+      }
 
-        if (comparability == 0) {
-          s1 = getPathForModule(module1).toString();
-          s2 = getPathForModule(module2).toString();
-          comparability = collator.compare(s1, s2);
-        }
+      // If fully-qualified module names are identical, then
+      // compare file paths.
 
-        return comparability;
+      if (comparability == 0) {
+        s1 = getPathForModule(module1).toString();
+        s2 = getPathForModule(module2).toString();
+        comparability = collator.compare(s1, s2);
       }
+
+      return comparability;
     };
   }
 

plugins/com.gwtplugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/modules/AbstractModule.java

@@ -14,13 +14,8 @@
  *******************************************************************************/
 package com.google.gwt.eclipse.core.modules;
 
-import com.google.gdt.eclipse.core.properties.WebAppProjectProperties;
 import com.google.gwt.eclipse.core.GWTPluginLog;
-import com.google.gwt.eclipse.core.util.Util;
 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IStorage;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
@@ -124,15 +119,6 @@ private static List<String> getElementsAttributes(Document doc, String elementNa
     return attrValues;
   }
 
-  protected final IStorage storage;
-
-  private String qualifiedName;
-
-  protected AbstractModule(IStorage storage) {
-    assert (storage != null);
-    this.storage = storage;
-  }
-
   /**
    * Two modules are considered equal iff their qualified names are the same.
    *
@@ -262,60 +248,6 @@ public void readModel(IDOMModel model) {
     return ret;
   }
 
-  /**
-   * Returns the package name for the module.
-   */
-  @Override
-  public String getQualifiedName() {
-    // Cache the qualified name
-    if (qualifiedName == null) {
-      String shortName = getShortName();
-      if (shortName != null && !shortName.isEmpty()) {
-        qualifiedName = getGWtMaven2ModuleName();
-        return qualifiedName;
-      }
-
-      qualifiedName = Util.removeFileExtension(storage.getName());
-
-      String modulePckg = doGetPackageName();
-      if (modulePckg != null) {
-        qualifiedName = modulePckg + "." + qualifiedName;
-      }
-    }
-
-    return qualifiedName;
-  }
-
-  /**
-   * GWT Maven project will have a short name
-   * @return the short name for module
-   */
-  private String getShortName() {
-    IFile file = (IFile) storage;
-    IFolder moduleFolder = (IFolder) file.getParent();
-    String shortName = WebAppProjectProperties.getGwtMavenModuleShortName(moduleFolder.getProject());
-    return shortName;
-  }
-
-  /**
-   * Get the gwt maven2 module name
-   * @return module name
-   */
-  private String getModuleNameGwtMaven2() {
-    IFile file = (IFile) storage;
-    IFolder moduleFolder = (IFolder) file.getParent();
-    String moduleName = WebAppProjectProperties.getGwtMavenModuleName(moduleFolder.getProject());
-    moduleName = moduleName.replaceAll(".*\\.(.*)", "$1");
-    return moduleName;
-  }
-
-  private String getGWtMaven2ModuleName() {
-    IFile file = (IFile) storage;
-    IFolder moduleFolder = (IFolder) file.getParent();
-    String moduleName = WebAppProjectProperties.getGwtMavenModuleName(moduleFolder.getProject());
-    return moduleName;
-  }
-
   /**
    * Returns a list of the <set-configuration-property name="propertyName" value="[return value]"/>.
    *
@@ -372,7 +304,4 @@ public int hashCode() {
   }
 
   protected abstract IDOMModel doGetModelForRead() throws IOException, CoreException;
-
-  protected abstract String doGetPackageName();
-
 }

plugins/com.gwtplugins.gwt.eclipse.core/src/com/google/gwt/eclipse/core/modules/ModuleFile.java

@@ -85,8 +85,11 @@ private IDOMModel getModelForEdit() throws IOException, CoreException {
     }
   }
 
+  private String qualifiedName = null;
+  private final IFile manifestFile;
+
   protected ModuleFile(IFile file) {
-    super(file);
+    this.manifestFile = file;
   }
 
   /**
@@ -114,14 +117,57 @@ public void editModel(IDOMModel model) {
     }.run();
   }
 
+  /**
+   * Returns the package name for the module.
+   */
+  @Override
+  public String getQualifiedName() {
+    // Cache the qualified name
+    if (qualifiedName == null) {
+      String shortName = getShortName();
+      if (shortName != null && !shortName.isEmpty()) {
+        qualifiedName = getGwtMaven2ModuleName();
+        return qualifiedName;
+      }
+
+      qualifiedName = Util.removeFileExtension(manifestFile.getName());
+
+      String modulePckg = doGetPackageName();
+      if (modulePckg != null) {
+        qualifiedName = modulePckg + "." + qualifiedName;
+      }
+    }
+
+    return qualifiedName;
+  }
+
+  /**
+   * GWT Maven project will have a short name
+   * @return the short name for module
+   */
+  private String getShortName() {
+    IFolder moduleFolder = (IFolder) manifestFile.getParent();
+    String shortName = WebAppProjectProperties.getGwtMavenModuleShortName(moduleFolder.getProject());
+    return shortName;
+  }
+
+  /**
+   * Get the gwt maven2 module name
+   * @return module name
+   */
+  private final String getGwtMaven2ModuleName() {
+    IFolder moduleFolder = (IFolder) manifestFile.getParent();
+    String moduleName = WebAppProjectProperties.getGwtMavenModuleName(moduleFolder.getProject());
+    return moduleName;
+  }
+
   /**
    * Returns the backing IFile for the module XML file.
    *
    * @return IFile referencing the module XML
    */
   public IFile getFile() {
-    // We received storage as an IFile in our ctor, so we know this cast works
-    return (IFile) storage;
+    return manifestFile;
   }
 
   /**
@@ -134,7 +180,7 @@ public IFile getFile() {
    * @return IFolder corresponding to the path
    */
   public IFolder getFolder(IPath moduleRelativePath) {
-    IPath moduleFolderPath = storage.getFullPath().removeLastSegments(1);
+    IPath moduleFolderPath = manifestFile.getFullPath().removeLastSegments(1);
     IPath folderPath = moduleFolderPath.append(moduleRelativePath);
     IResource folder = Util.getWorkspaceRoot().findMember(folderPath);
     return (IFolder) folder;
@@ -233,8 +279,7 @@ protected IDOMModel doGetModelForRead() throws IOException, CoreException {
     return (IDOMModel) modelManager.getModelForRead(getFile());
   }
 
-  @Override
-  protected String doGetPackageName() {
+  private final String doGetPackageName() {
     IFolder moduleFolder = (IFolder) getFile().getParent();
     IJavaElement javaElement = JavaCore.create(moduleFolder);
 
@@ -256,7 +301,6 @@ protected String doGetPackageName() {
     } else {
       // TODO: handle super-source case here
     }
-
     return "";
   }