[jbosstools-commits] JBoss Tools SVN: r32249 - in branches/jbosstools-3.2.x/smooks: plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls and 1 other directories.

Author: tfennelly Date: 2011-06-21 04:57:30 -0400 (Tue, 21 Jun 2011) New Revision: 32249 Modified: branches/jbosstools-3.2.x/smooks/ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties Log: JBIDE-9197: No user error message for UnsupportedClassVersionError https://issues.jboss.org/browse/JBIDE-9197 Property changes on: branches/jbosstools-3.2.x/smooks ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/smooks:29129-29130,29167-29168,32217-32218 + /trunk/smooks:29129-29130,29167-29168,32217-32218,32227-32228 Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java =================================================================== --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java 2011-06-21 08:14:15 UTC (rev 32248) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java 2011-06-21 08:57:30 UTC (rev 32249) @@ -77,17 +77,18 @@ .getLocation(); for (int i = 0; i < roots.length; i++) { try { - if (roots[i].isArchive()) { + IPackageFragmentRoot iPackageFragmentRoot = roots[i]; + if (iPackageFragmentRoot.isArchive()) { File f = new File(FileLocator.resolve( - installPath.append(roots[i].getPath()).toFile() + installPath.append(iPackageFragmentRoot.getPath()).toFile() .toURL()).getFile()); if (!f.exists()) { f = new File(FileLocator.resolve( - roots[i].getPath().makeAbsolute().toFile() + iPackageFragmentRoot.getPath().makeAbsolute().toFile() .toURL()).getFile()); } if (!f.exists()) { - IJavaElement javaElement = roots[i].getPrimaryElement(); + IJavaElement javaElement = iPackageFragmentRoot.getPrimaryElement(); String jarName = javaElement.getElementName(); IResource jarResource = project.getProject().findMember(jarName); @@ -98,14 +99,14 @@ list.add(f.toURL()); } else { - IPath path = roots[i].getJavaProject().getOutputLocation(); + IPath path = iPackageFragmentRoot.getJavaProject().getOutputLocation(); if (path.segmentCount() > 1) { IWorkspaceRoot root = ResourcesPlugin.getWorkspace() .getRoot(); path = root.getFolder(path).getLocation(); list.add(path.toFile().toURL()); } else { - path = roots[i].getJavaProject().getProject() + path = iPackageFragmentRoot.getJavaProject().getProject() .getLocation(); list.add(path.toFile().toURL()); } Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java =================================================================== --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2011-06-21 08:14:15 UTC (rev 32248) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2011-06-21 08:57:30 UTC (rev 32249) @@ -439,6 +439,8 @@ } protected void refreshJavaBeanModel() { + String error = null; + if (beanClass == null || "".equals(beanClass.trim())) { //$NON-NLS-1$ viewer.setInput(""); //$NON-NLS-1$ } else { @@ -471,8 +473,13 @@ viewer.setInput(""); //$NON-NLS-1$ } catch (ClassNotFoundException e1) { viewer.setInput(""); //$NON-NLS-1$ + error = Messages.JavaBeanCreationWizardPage_ClassNotFoundException; + } catch (UnsupportedClassVersionError classVersion) { + error = Messages.JavaBeanCreationWizardPage_UnsupportedClassVersionError; } } + this.setErrorMessage(error); + this.setPageComplete(error == null); } private void createBeanClassControls(Composite mainComposite) { Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java =================================================================== --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java 2011-06-21 08:14:15 UTC (rev 32248) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java 2011-06-21 08:57:30 UTC (rev 32249) @@ -8,6 +8,8 @@ public static String JavaBeanCreationWizardPage_27; public static String JavaBeanCreationWizardPage_ArrayButtonText; public static String JavaBeanCreationWizardPage_BeanClassEmptyErrorMessage; + public static String JavaBeanCreationWizardPage_UnsupportedClassVersionError; + public static String JavaBeanCreationWizardPage_ClassNotFoundException; public static String JavaBeanCreationWizardPage_BeanClassLabel; public static String JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage1; public static String JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage2; Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties =================================================================== --- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties 2011-06-21 08:14:15 UTC (rev 32248) +++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties 2011-06-21 08:57:30 UTC (rev 32249) @@ -2,6 +2,8 @@ JavaBeanCreationWizardPage_27=" JavaBeanCreationWizardPage_ArrayButtonText=Array JavaBeanCreationWizardPage_BeanClassEmptyErrorMessage=Java Class must be configured +JavaBeanCreationWizardPage_UnsupportedClassVersionError=Class compile version not supported by Java Environment +JavaBeanCreationWizardPage_ClassNotFoundException=Class not found on project Classpath JavaBeanCreationWizardPage_BeanClassLabel=Java Class : JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage1=Bean ID ' JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage2=' is duplicate