[jbosstools-commits] JBoss Tools SVN: r7108 - in trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools: struts and 15 other directories.

Author: scabanovich Date: 2008-03-25 10:16:56 -0400 (Tue, 25 Mar 2008) New Revision: 7108 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintFileSize.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProjectUtil.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/ConstructorComp.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/ConstructorDesc.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/PropertyComp.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetupModuleHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenPageHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageContext.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebTree.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsBreakpointManager.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessHelper.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessStructureHelper.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/TilesStructureHelper.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/JSPLinksParser.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/link/Links.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectConfiguration.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectPlugin.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectTagLibs.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectsRoot.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsPromptingProvider.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/FileValidatorLoader.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/FileValidatorRecognizer.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/ValidatorArg11Impl.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/PostfixUrlPattern.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/PrefixUrlPattern.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/UrlPattern.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/resource/ResourceMapping.java Log: JBIDE-1945 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintFileSize.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintFileSize.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintFileSize.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -22,9 +22,8 @@ v = value.substring(0, value.length() - 1); } try { - int i = Integer.parseInt(v); - return (i >= 0); - } catch (Exception e) { + return (v.length() > 0 && Integer.parseInt(v) >= 0); + } catch (NumberFormatException e) { StrutsModelPlugin.getPluginLog().logError(e); return false; } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -15,7 +15,6 @@ import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.util.ClassLoaderUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.osgi.framework.BundleContext; /** * @author Eskimo Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProjectUtil.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProjectUtil.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsProjectUtil.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -11,6 +11,7 @@ package org.jboss.tools.struts; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; public class StrutsProjectUtil { public static final String STRUTS_NATURE_ID = StrutsProject.NATURE_ID; @@ -20,7 +21,7 @@ public static boolean hasStrutsNature(IProject project) { try { return project != null && project.hasNature(StrutsProjectUtil.STRUTS_NATURE_ID); - } catch (Exception e) { + } catch (CoreException e) { StrutsModelPlugin.getPluginLog().logError(e); return false; } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/ConstructorComp.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/ConstructorComp.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/ConstructorComp.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -11,15 +11,13 @@ * * @author valera */ -public class ConstructorComp implements java.util.Comparator { +public class ConstructorComp implements java.util.Comparator<ConstructorDesc> { /** Creates a new instance of ConstructorComp */ public ConstructorComp() { } - public int compare(Object o1, Object o2) { - ConstructorDesc c1 = (ConstructorDesc)o1; - ConstructorDesc c2 = (ConstructorDesc)o2; + public int compare(ConstructorDesc c1, ConstructorDesc c2) { ParameterList p1 = c1.getParameterList(); ParameterList p2 = c2.getParameterList(); int res = p1.size() - p2.size(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/ConstructorDesc.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/ConstructorDesc.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/ConstructorDesc.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -53,7 +53,7 @@ return params; } - public Set getExceptions() { + public Set<String> getExceptions() { return exceptions; } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/PropertyComp.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/PropertyComp.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/gen/java/PropertyComp.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -12,15 +12,13 @@ * * @author valera */ -public class PropertyComp implements java.util.Comparator { +public class PropertyComp implements java.util.Comparator<PropertyDesc> { /** Creates a new instance of PropertyComp */ public PropertyComp() { } - public int compare(Object o1, Object o2) { - PropertyDesc p1 = (PropertyDesc)o1; - PropertyDesc p2 = (PropertyDesc)o2; + public int compare(PropertyDesc p1, PropertyDesc p2) { int res = getWeight(p1) - getWeight(p2); if (res != 0) return res; return p1.name.compareTo(p2.name); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/CreateForwardHandler.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -114,12 +114,8 @@ CreatePageSupport.createFile(fs, jsppath, null); } setShape(object, prop); - try { XModelObject process = StrutsProcessStructureHelper.instance.getProcess(object); StrutsProcessHelper.getHelper(process).updatePages(); - } catch (Exception e) { - StrutsModelPlugin.getPluginLog().logError(e); - } } private boolean isEqualRoots(String r1, String r2) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetupModuleHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetupModuleHandler.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/SetupModuleHandler.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -113,10 +113,10 @@ } public static String getString(Properties props) { - Iterator it = props.entrySet().iterator(); + Iterator<Map.Entry<Object,Object>> it = props.entrySet().iterator(); String s = ""; while (it.hasNext()) { - Map.Entry entry = (Map.Entry)it.next(); + Map.Entry<Object,Object> entry = it.next(); s += (s.length() > 0 ? "," : "") + entry.getKey() + "=" + entry.getValue(); } return s; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsAdoptManager.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -11,6 +11,7 @@ import org.jboss.tools.struts.model.*; import org.jboss.tools.common.meta.*; import org.jboss.tools.common.meta.action.*; +import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.struts.model.handlers.page.create.*; @@ -89,13 +90,13 @@ XAction a = object.getModelEntity().getActionList().getAction("CopyActions.Copy"); try { a.executeHandler(object, p); - } catch (Exception e) { + } catch (XModelException e) { StrutsModelPlugin.getPluginLog().logError(e); } a = target.getModelEntity().getActionList().getAction("CopyActions.Paste"); try { a.executeHandler(target, p); - } catch (Exception e) { + } catch (XModelException e) { StrutsModelPlugin.getPluginLog().logError(e); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/StrutsDeleteHandler.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -49,7 +49,7 @@ deletePage.executeHandler(object, prop); return; } - List referers = null; + List<XModelObject> referers = null; if (object instanceof ReferenceObjectImpl) { XModelObject ref = ((ReferenceObjectImpl)object).getReference(); if (ENT_PROCESSITEM.equals(object.getModelEntity().getName())) { @@ -82,7 +82,7 @@ try { if (referers != null && referers.size() > 0) { for (int i = 0; i < referers.size(); i++) { - XModelObject referer = (XModelObject)referers.get(i); + XModelObject referer = referers.get(i); XActionHandler unlink = referer.getModelEntity().getActionList().getAction(UNLINK_ACTION); if (unlink != null && unlink.isEnabled(referer)) { unlink.executeHandler(referer, prop); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/DeletePageHandler.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -23,7 +23,6 @@ import org.jboss.tools.common.model.undo.XRemoveUndo; import org.jboss.tools.common.model.undo.XUndoManager; import org.jboss.tools.struts.StrutsConstants; -import org.jboss.tools.struts.StrutsModelPlugin; import org.jboss.tools.struts.StrutsPreference; import org.jboss.tools.struts.messages.StrutsUIMessages; import org.jboss.tools.struts.model.StrutsProcessImpl; @@ -46,11 +45,7 @@ IFile f = getFile(object); boolean deleteFile = true; if(f != null) { - try { - deleteFile = "yes".equals(StrutsPreference.REMOVE_PAGE_AND_FILE.getValue()); //$NON-NLS-1$ - } catch (Exception e) { - StrutsModelPlugin.getPluginLog().logError(e); - } + deleteFile = "yes".equals(StrutsPreference.REMOVE_PAGE_AND_FILE.getValue()); //$NON-NLS-1$ ServiceDialog d = object.getModel().getService(); Properties xp = new Properties(); xp.setProperty(ServiceDialog.DIALOG_MESSAGE, StrutsUIMessages.DELETE_PAGE + object.getPresentationString() + "?"); //$NON-NLS-2$ @@ -58,11 +53,7 @@ xp.put(ServiceDialog.CHECKED, new Boolean(deleteFile)); if(!d.openConfirm(xp)) return; deleteFile = ((Boolean)xp.get(ServiceDialog.CHECKED)).booleanValue(); - try { - StrutsPreference.REMOVE_PAGE_AND_FILE.setValue(deleteFile ? "yes" : "no"); //$NON-NLS-1$ //$NON-NLS-2$ - } catch (Exception e) { - StrutsModelPlugin.getPluginLog().logError(e); - } + StrutsPreference.REMOVE_PAGE_AND_FILE.setValue(deleteFile ? "yes" : "no"); //$NON-NLS-1$ //$NON-NLS-2$ } XModelObject parent = object.getParent(); object.removeFromParent(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenPageHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenPageHandler.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/OpenPageHandler.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -43,7 +43,7 @@ if(o == null) o = XModelImpl.getByRelativePath(source.getModel(), path); if(o == null) return null; - Map map = WebModulesHelper.getInstance(source.getModel()).getWebFileSystems(); + Map<String,XModelObject> map = WebModulesHelper.getInstance(source.getModel()).getWebFileSystems(); XModelObject fs = o; while(fs != null && fs.getFileType() != XModelObject.SYSTEM) fs = fs.getParent(); return (fs != null && map.containsValue(fs)) ? o : null; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/RunHandler.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -62,7 +62,7 @@ XModelObject wr = WebModulesHelper.getInstance(fs.getModel()).getFileSystem(""); if(wr == null) return false; if(wr == fs) return true; - Map map = WebModulesHelper.getInstance(fs.getModel()).getWebFileSystems(); + Map<String,XModelObject> map = WebModulesHelper.getInstance(fs.getModel()).getWebFileSystems(); if(!map.containsValue(fs)) return false; String p1 = getCanonicalLocation(wr); String p2 = getCanonicalLocation(fs); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageContext.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageContext.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageContext.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -103,10 +103,10 @@ if(thisModuleRoot == null) thisModuleRoot = ""; selectedFileSystem = null; - Map map = WebModulesHelper.getInstance(process.getModel()).getWebFileSystems(); - for(Iterator it = map.keySet().iterator(); it.hasNext();) { - String module = it.next().toString(); - XModelObject fs = (XModelObject)map.get(module); + Map<String,XModelObject> map = WebModulesHelper.getInstance(process.getModel()).getWebFileSystems(); + for(Iterator<String> it = map.keySet().iterator(); it.hasNext();) { + String module = it.next(); + XModelObject fs = map.get(module); boolean isWebroot = (module.length() == 0); boolean isThisModule = (thisModuleRoot.length() > 0 && thisModuleRoot.equals(module)); if(isThisModule) { @@ -152,10 +152,8 @@ /// public String setRootByPath(String path) { - Iterator it = roots.keySet().iterator(); - while(it.hasNext()) { - String fsp = (String)it.next(); - String m = (String)roots.get(fsp); + for (String fsp: roots.keySet()) { + String m = roots.get(fsp); if(path.startsWith(m + "/")) { setSelectedFileSystem(process.getModel().getByPath("FileSystems/" + fsp)); return path.substring(m.length()); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/CreatePageSupport.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -63,7 +63,7 @@ if(context.isPreselected()) { try { onSelection(); - } catch (Exception e) { + } catch (XModelException e) { StrutsModelPlugin.getPluginLog().logError("Exception caught in CreatePageSupport:reset " + e.getMessage(), e); } } else { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebTree.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebTree.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/handlers/page/create/WebTree.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -51,10 +51,9 @@ thismodule = (contextProcess == null) ? null : StrutsProcessStructureHelper.instance.getProcessModule(contextProcess); Vector<XModelObject> v = new Vector<XModelObject>(); web = null; - Map map = WebModulesHelper.getInstance(model).getWebFileSystems(); - for (Iterator it = map.keySet().iterator(); it.hasNext();) { - String module = it.next().toString(); - XModelObject fs = (XModelObject)map.get(module); + Map<String,XModelObject> map = WebModulesHelper.getInstance(model).getWebFileSystems(); + for (String module: map.keySet()) { + XModelObject fs = map.get(module); if(fs == null) continue; boolean isWebroot = (module.length() == 0); boolean isThisModule = (thismodule != null && thismodule.length() > 0 && thismodule.equals(module)); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsBreakpointManager.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsBreakpointManager.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsBreakpointManager.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -324,9 +324,9 @@ } public void changeAllBreakpointStatus(int status, boolean mergeStatuses) { - Iterator keys = map.keySet().iterator(); + Iterator<String> keys = map.keySet().iterator(); while(keys.hasNext()) { - String key = (String)keys.next(); + String key = keys.next(); changeAllBreakpointStatus(key, status, mergeStatuses); } } @@ -344,9 +344,9 @@ return new BreakpointId[0]; } ArrayList<BreakpointId> ids = new ArrayList<BreakpointId>(); - Iterator keys = map.keySet().iterator(); + Iterator<String> keys = map.keySet().iterator(); while(keys.hasNext()) { - String key = (String)keys.next(); + String key = keys.next(); BreakpointId[] bIds = ((BreakpointsStatus)map.get(key)).getBreakpointIds(); for(int i=0; i<bIds.length; i++) { bIds[i].setModelPath(key); @@ -444,7 +444,7 @@ public int getSummaryStatus() { int maxPriority = -1; - Iterator keys = markersStatuses.keySet().iterator(); + Iterator<String> keys = markersStatuses.keySet().iterator(); while(keys.hasNext()) { String key = (String)keys.next(); Integer status = (Integer)markersStatuses.get(key); @@ -473,7 +473,7 @@ } public void setAllStatusAsInt(int status, boolean mergeStatuses) { - Iterator keys = markersStatuses.keySet().iterator(); + Iterator<String> keys = markersStatuses.keySet().iterator(); while(keys.hasNext()) { String key = (String)keys.next(); int oldStatus = getStatus(key); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessHelper.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessHelper.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessHelper.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -143,6 +143,31 @@ } } + //Probably, Set is enough, but List worked very long successfully + //so let'n not take a risk and use Set for optimizing only. + private class Binds { + List<XModelObject> list = new ArrayList<XModelObject>(); + Set<XModelObject> set = new HashSet<XModelObject>(); + + public void add(XModelObject o) { + if(set.contains(o)) return; + set.add(o); + list.add(o); + if(set.size() != list.size()) { + System.out.println("Panikk: " + set.size() + " " + list.size()); + } + } + + public int size() { + return list.size(); + } + + public void clear() { + list.clear(); + set.clear(); + } + } + private ArrayList<Task> tasks = new ArrayList<Task>(); private void addTask(Task task) { @@ -176,7 +201,7 @@ private XModelObject config; private Map<String,XModelObject> objects = new HashMap<String,XModelObject>(); private Map<String,XModelObject> actions = new HashMap<String,XModelObject>(); - private List<XModelObject> binds = new ArrayList<XModelObject>(); + private Binds binds = new Binds(); private Map<String,XModelObject> pages = new HashMap<String,XModelObject>(); StrutsProcessStructureHelper h = new StrutsProcessStructureHelper(); boolean is_10 = true; @@ -242,9 +267,9 @@ XModelObject globalExc = config.getChildByPath(ELM_GLOBALEXC); XModelObject actionMap = config.getChildByPath(ELM_ACTIONMAP); - Map forwMap = getChildren(globalForw); - Map excMap = globalExc == null ? new HashMap() : getChildren(globalExc); - Map actMap = getChildren(actionMap); + Map<String,XModelObject> forwMap = getChildren(globalForw); + Map<String,XModelObject> excMap = globalExc == null ? new HashMap<String,XModelObject>() : getChildren(globalExc); + Map<String,XModelObject> actMap = getChildren(actionMap); XModelObject[] children = process.getChildren(); for (int i = 0; i < children.length; i++) { @@ -281,17 +306,14 @@ } } - Iterator it = forwMap.values().iterator(); - while (it.hasNext()) { - reloadForwardInternal(process, (XModelObject)it.next(), null); + for(XModelObject o: forwMap.values()) { + reloadForwardInternal(process, o, null); } - it = excMap.values().iterator(); - while (it.hasNext()) { - reloadExceptionInternal(process, (XModelObject)it.next(), null); + for(XModelObject o: excMap.values()) { + reloadExceptionInternal(process, o, null); } - it = actMap.values().iterator(); - while (it.hasNext()) { - reloadActionInternal(process, (XModelObject)it.next(), null); + for(XModelObject o: actMap.values()) { + reloadActionInternal(process, o, null); } cleanObjects(); resolveInternal(); @@ -319,16 +341,14 @@ } else { prev.removeFromParent(); } - //binds.addAll(getReferers(name)); } updateActionInternal(parent, ref, action); prev = (XModelObject)objects.put(getLocalPath2(action), action); if (prev != null) { - //String name = prev.getPathPart(); prev.removeFromParent(); - //binds.addAll(getReferers(parent, name)); } - binds.addAll(getReferers(parent, action.getPathPart())); + List<XModelObject> list = getReferers(parent, action.getPathPart()); + for (XModelObject o: list) addBind(o); } } @@ -337,6 +357,10 @@ action.removeFromParent(); updateProcess(); } + + private void addBind(XModelObject o) { + binds.add(o); + } private XModelObject createAction(XModelObject parent, XModelObject ref) { Properties props = new Properties(); @@ -362,7 +386,7 @@ String subtype = action.getAttributeValue(ATT_SUBTYPE); if(!SUBTYPE_UNKNOWN.equals(subtype)) { //6389// - List l = getReferers(action.getParent(), action.getPathPart()); + List<XModelObject> l = getReferers(action.getParent(), action.getPathPart()); if(l.size() == 0) { action.removeFromParent(); return; @@ -416,7 +440,7 @@ ((ReferenceObjectImpl)forward).setReference(ref); action.setAttributeValue(ATT_SUBTYPE, subtype); } else { - Map refMap = getChildren(ref); + Map<String,XModelObject> refMap = getChildren(ref); XModelObject[] localBinds = action.getChildren(); for (int j = 0; j < localBinds.length; j++) { String type = localBinds[j].getAttributeValue(ATT_TYPE); @@ -427,9 +451,7 @@ reloadExceptionInternal(action, refBind, localBinds[j]); } } - Iterator it = refMap.values().iterator(); - while (it.hasNext()) { - XModelObject refBind = (XModelObject)it.next(); + for(XModelObject refBind: refMap.values()) { String entity = refBind.getModelEntity().getName(); if (entity.startsWith(ENT_FORWARD)) { reloadForwardInternal(action, refBind, null); @@ -442,7 +464,7 @@ } XModelObject[] children = action.getChildren(); for (int i = 0; i < children.length; i++) { - binds.add(children[i]); + addBind(children[i]); } actions.put(action.getAttributeValue(ATT_PATH), action); } @@ -494,7 +516,7 @@ forward.setAttributeValue(ATT_PATH, ref.getAttributeValue(ATT_PATH)); forward.setAttributeValue(ATT_TITLE, name); ((ReferenceObjectImpl)forward).setReference(ref); - binds.add(forward); + addBind(forward); } public void reloadException(XModelObject parent, XModelObject ref, XModelObject exception) { @@ -537,7 +559,7 @@ exception.setAttributeValue(ATT_PATH, ref.getAttributeValue(ATT_PATH)); exception.setAttributeValue(ATT_TITLE, name.substring(name.lastIndexOf('.')+1)); ((ReferenceObjectImpl)exception).setReference(ref); - binds.add(exception); + addBind(exception); } @@ -546,19 +568,20 @@ } private void resolveInternal() { - Iterator it = binds.iterator(); - if(!it.hasNext() && urlPattern != null) return; - + if(binds.size() == 0 && urlPattern != null) return; + WebModulesHelper wmh = WebModulesHelper.getInstance(process.getModel()); - Set modules = (is_10) ? new HashSet() : wmh.getModules(); + Set<String> modules = (is_10) ? new HashSet<String>() : wmh.getModules(); module = (is_10) ? "" : WebModulesHelper.getInstance(process.getModel()).getModuleForConfig(process.getParent()); if(module == null) module = ""; urlPattern = wmh.getUrlPattern(module); + Iterator<XModelObject> it = binds.list.iterator(); while (it.hasNext()) { - XModelObject bind = (XModelObject)it.next(); + XModelObject bind = it.next(); if (!bind.isActive()) { it.remove(); + binds.set.remove(bind); continue; } String path = bind.getAttributeValue(ATT_PATH); @@ -633,7 +656,7 @@ } public void removeUnconfirmed() { - Set set = getReferredTargets(process); + Set<String> set = getReferredTargets(process); XModelObject[] os = process.getChildren(); for (int i = 0; i < os.length; i++) { if(set.contains(os[i].getPathPart())) continue; @@ -772,7 +795,7 @@ // drop dead objects private void cleanObjects() { if (!process.isActive()) return; - Iterator it = objects.values().iterator(); + Iterator<XModelObject> it = objects.values().iterator(); while (it.hasNext()) { XModelObject o = (XModelObject)it.next(); if (!o.isActive()) it.remove(); @@ -859,7 +882,9 @@ private static void fillReferers(List<XModelObject> list, XModelObject obj, String target) { XModelObject[] children = obj.getChildren(); for (int i = 0; i < children.length; i++) { - if (target.equals(children[i].getAttributeValue(ATT_TARGET))) list.add(children[i]); + if (target.equals(children[i].getAttributeValue(ATT_TARGET))) { + list.add(children[i]); + } fillReferers(list, children[i], target); } } @@ -900,8 +925,8 @@ pu.unlock(); } - Map osX = new HashMap(); - Map gsX = new HashMap(); + Map<String,XModelObject> osX = new HashMap<String,XModelObject>(); + Map<String,XModelObject> gsX = new HashMap<String,XModelObject>(); private void prepareMaps() { Map<String,XModelObject> os = new HashMap<String,XModelObject>(); @@ -929,9 +954,9 @@ private void updatePageInternal(XModelObject page, JSPLinksParser p) { if(urlPattern == null) return; - Map os = osX; - Map gs = gsX; - Set ls = p.getAllLinks(); + Map<String,XModelObject> os = osX; + Map<String,XModelObject> gs = gsX; + Set<String> ls = p.getAllLinks(); XModelObject[] links = page.getChildren(); for (int i = 0; i < links.length; i++) { String path = links[i].getAttributeValue(ATT_PATH); @@ -951,7 +976,7 @@ String subtype = trgobj.getAttributeValue(ATT_SUBTYPE); String objpath = trgobj.getAttributeValue(ATT_PATH); if(TYPE_ACTION.equals(type) && SUBTYPE_UNKNOWN.equals(subtype)) { - List l = getReferers(process, trgobj.getPathPart()); + List<XModelObject> l = getReferers(process, trgobj.getPathPart()); if(l.isEmpty()) { actions.remove(objpath); trgobj.removeFromParent(); @@ -965,18 +990,18 @@ } } } else if(trg.length() == 0 || process.getChildByPath(trg) == null) { - binds.add(links[i]); + addBind(links[i]); } } } - Iterator it = ls.iterator(); - while(it.hasNext()) { - String path = (String)it.next(); + for (String path: ls) { boolean isForward = p.isForward(path); XModelObject target = (isForward) ? (XModelObject)gs.get(path) : (XModelObject)os.get(path); XModelObject link = addLink(page, target, path); - if(target == null) binds.add(link); + if(target == null) { + addBind(link); + } } if(binds.size() > 0) { resolveInternal(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessStructureHelper.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessStructureHelper.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessStructureHelper.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -327,13 +327,13 @@ if(path == null || !path.startsWith("/")) return null; XModelObject o = page.getModel().getByPath(path); if(o == null || is10(page.getParent())) return o; - Map modules = WebModulesHelper.getInstance(page.getModel()).getWebFileSystems(); + Map<String,XModelObject> modules = WebModulesHelper.getInstance(page.getModel()).getWebFileSystems(); if(modules.size() < 2) return o; if(path.startsWith("//")) return null; String xmodule = getUrlPattern(page).getModule(path, modules.keySet(), null); if(xmodule != null && xmodule.length() > 0) return null; String module = getProcessModule(page); - XModelObject fs = (module == null) ? null : (XModelObject)modules.get(module); + XModelObject fs = (module == null) ? null : modules.get(module); return (fs == null) ? null : fs.getChildByPath(path.substring(1)); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/TilesStructureHelper.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/TilesStructureHelper.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/TilesStructureHelper.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -189,9 +189,9 @@ return WebModulesHelper.getInstance(object.getModel()).getUrlPattern(getProcessModule(object)); } - public Set getTiles(XModelObject object) { + public Set<String> getTiles(XModelObject object) { XModelObject process = getProcess(object); - if(process == null) return new TreeSet(); + if(process == null) return new TreeSet<String>(); StrutsProcessHelper h = StrutsProcessHelper.getHelper(process); h.updateTiles(); return h.getTiles(); @@ -301,13 +301,13 @@ if(path == null || !path.startsWith("/")) return null; XModelObject o = page.getModel().getByPath(path); if(o == null || is10(page.getParent())) return o; - Map modules = WebModulesHelper.getInstance(page.getModel()).getWebFileSystems(); + Map<String,XModelObject> modules = WebModulesHelper.getInstance(page.getModel()).getWebFileSystems(); if(modules.size() < 2) return o; if(path.startsWith("//")) return null; String xmodule = getUrlPattern(page).getModule(path, modules.keySet(), null); if(xmodule != null && xmodule.length() > 0) return null; String module = getProcessModule(page); - XModelObject fs = (module == null) ? null : (XModelObject)modules.get(module); + XModelObject fs = (module == null) ? null : modules.get(module); return (fs == null) ? null : fs.getChildByPath(path.substring(1)); } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/JSPLinksParser.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/JSPLinksParser.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/JSPLinksParser.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -89,7 +89,7 @@ private void parseAdvanced(int b, int e) { if(links == null) return; - Set tags = links.getTags(); + Set<String> tags = links.getTags(); while(b < e) { int i = source.indexOf("<", b); if(i < 0) return; @@ -251,9 +251,9 @@ return false; } - private boolean areSetsEqual(Set s1, Set s2) { + private boolean areSetsEqual(Set<String> s1, Set<String> s2) { if(s1.size() != s2.size()) return false; - Iterator it = s1.iterator(); + Iterator<String> it = s1.iterator(); while(it.hasNext()) if(!s2.contains(it.next())) return false; it = s2.iterator(); while(it.hasNext()) if(!s1.contains(it.next())) return false; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/link/Links.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/link/Links.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/page/link/Links.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -20,7 +20,7 @@ ArrayList<LinksListener> listeners = new ArrayList<LinksListener>(); long timeStamp = 0; - public Set getTags() { + public Set<String> getTags() { return tags; } public String[] getTagsArray() { @@ -55,9 +55,9 @@ link.setReferTo(referTo); s.add(link); } - Iterator it = _tags.iterator(); + Iterator<String> it = _tags.iterator(); while(it.hasNext()) { - String tag = it.next().toString(); + String tag = it.next(); Set<Link> s = (Set<Link>)_links.get(tag); if(s == null) continue; Link[] ls = s.toArray(new Link[0]); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/SelectActionForwardPathSupport.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -18,7 +18,7 @@ import org.jboss.tools.struts.model.helpers.*; public class SelectActionForwardPathSupport extends SpecialWizardSupport implements StrutsConstants { - Set tiles = new TreeSet(); + Set<String> tiles = new TreeSet<String>(); ActionsTree actions = null; int tools = 6; @@ -43,11 +43,10 @@ private void loadTiles() { tiles.clear(); if((tools & 4) != 0) { - Set ts = (Set)p.get("tiles"); + Set<String> ts = (Set)p.get("tiles"); if(ts != null) tiles.addAll(ts); } actions = (ActionsTree)p.get("actionsTree"); -// getProperties().put("tiles", tiles); } private void loadSelection() { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectConfiguration.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectConfiguration.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectConfiguration.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -78,9 +78,7 @@ list.add(module); } } - Iterator it = initParams.keySet().iterator(); - while(it.hasNext()) { - String n = it.next().toString(); + for (String n: initParams.keySet()) { XModelObject webModule = (XModelObject)initParams.get(n); StrutsProjectModule module = (StrutsProjectModule)getModel().createModelObject("StrutsProjectModule", null); module.setAttributeValue("name", n); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectPlugin.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectPlugin.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectPlugin.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -31,8 +31,6 @@ isLoading = true; valid = true; try { - Map initParams = new HashMap(); - initParams.clear(); WebModulesHelper h = WebModulesHelper.getInstance(getModel()); XModelObject[] cs = h.getAllConfigs(); Set<String> uris = new TreeSet<String>(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectTagLibs.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectTagLibs.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectTagLibs.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -29,10 +29,10 @@ protected List<XModelObject> collect(Iterator<XModelObject> rs) { List<XModelObject> list = super.collect(rs); - Iterator it = list.iterator(); + Iterator<XModelObject> it = list.iterator(); Set<String> set = new HashSet<String>(); while(it.hasNext()) { - XModelObject o = (XModelObject)it.next(); + XModelObject o = it.next(); String uri = o.getAttributeValue("uri"); if(set.contains(uri)) { it.remove(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectsRoot.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectsRoot.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsProjectsRoot.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -15,6 +15,7 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.event.XModelTreeEvent; @@ -138,7 +139,7 @@ } } return 0; - } catch (Exception e) { + } catch (CoreException e) { StrutsModelPlugin.getPluginLog().logError(e); return 0; } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsPromptingProvider.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsPromptingProvider.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/pv/StrutsPromptingProvider.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -16,7 +16,6 @@ import org.jboss.tools.common.model.java.handlers.OpenJavaSourceHandler; import org.jboss.tools.common.model.XModel; -import org.jboss.tools.struts.StrutsModelPlugin; import org.jboss.tools.struts.model.helpers.open.*; import org.jboss.tools.jst.web.project.list.IWebPromptingProvider; @@ -64,14 +63,10 @@ error = h.run(model, forward); } else if(STRUTS_OPEN_LINK_PAGE.equals(id)) { String page = prefix; - try { - if(new File(page).isFile()) { - List<Object> l = new ArrayList<Object>(); - l.add(page); - return l; - } - } catch (Exception e) { - StrutsModelPlugin.getPluginLog().logError(e); + if(page != null && new File(page).isFile()) { + List<Object> l = new ArrayList<Object>(); + l.add(page); + return l; } IFile f = (IFile)properties.get(FILE); OpenLinkPageHelper h = new OpenLinkPageHelper(); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddMessagesHandler.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -47,10 +47,13 @@ } private XModelObject getTemplate(XModel model) { + if(action == null) return null; + String v = action.getProperty("index"); + if(v == null || v.length() == 0) return null; int i = -1; try { - i = Integer.valueOf(action.getProperty("index")).intValue(); - } catch (Exception e) { + i = Integer.parseInt(v); + } catch (NumberFormatException e) { StrutsModelPlugin.getPluginLog().logError(e); } return getTemplate(model, i); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/plugins/model/handlers/AddSpecialPluginHandler.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -73,10 +73,13 @@ } private XModelObject getPlugin(XModel model) { + if(action == null) return null; + String v = action.getProperty("index"); + if(v == null || v.length() == 0) return null; int i = -1; try { - i = Integer.valueOf(action.getProperty("index")).intValue(); //$NON-NLS-1$ - } catch (Exception e) { + i = Integer.parseInt(v); + } catch (NumberFormatException e) { StrutsModelPlugin.getPluginLog().logError(e); } if(i < 0) return null; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/FileValidatorLoader.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/FileValidatorLoader.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/FileValidatorLoader.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -54,7 +54,7 @@ int p = -1; try { p = Integer.parseInt(pos); - } catch (Exception e) { + } catch (NumberFormatException e) { StrutsModelPlugin.getPluginLog().logError(e); } if(p < 0) p = 0; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/FileValidatorRecognizer.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/FileValidatorRecognizer.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/FileValidatorRecognizer.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.struts.validators.model; +import java.io.IOException; + import org.jboss.tools.common.model.loaders.*; import org.jboss.tools.common.xml.XMLEntityResolver; import org.jboss.tools.struts.StrutsModelPlugin; @@ -19,7 +21,7 @@ try { XMLEntityResolver.registerPublicEntity(DOC_PUBLICID, FileValidatorRecognizer.class, "/meta/validator_1_0.dtd"); XMLEntityResolver.registerPublicEntity(DOC_PUBLICID_11, FileValidatorRecognizer.class, "/meta/validator_1_1_3.dtd"); - } catch (Exception e) { + } catch (IOException e) { StrutsModelPlugin.getPluginLog().logError(e); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/ValidatorArg11Impl.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/ValidatorArg11Impl.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validators/model/ValidatorArg11Impl.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -37,7 +37,7 @@ if(pos != null && pos.length() > 0) { try { p = Integer.parseInt(pos); - } catch (Exception e) { + } catch (NumberFormatException e) { StrutsModelPlugin.getPluginLog().logError(e); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectStepLocation.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -18,7 +18,6 @@ import org.jboss.tools.common.model.ServiceDialog; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.struts.messages.StrutsUIMessages; -import org.jboss.tools.jst.web.project.helpers.NewWebProjectHelper; public class AdoptProjectStepLocation extends AWStep { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/adopt/AdoptProjectSupport.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -55,7 +55,7 @@ setAttributeValue(0, "location", presetLocation); try { action(NEXT); - } catch (Exception e) { + } catch (XModelException e) { //obsolete //ignore StrutsModelPlugin.getPluginLog().logError(e); return; @@ -68,7 +68,7 @@ setAttributeValue(0, "location", presetLocation); try { action(NEXT); - } catch (Exception e) { + } catch (XModelException e) { //obsolete //ignore StrutsModelPlugin.getPluginLog().logError(e); return; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/sync/SyncProjectContext.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -111,7 +111,8 @@ private boolean updateDescribedModulesInfo() { boolean modified = false; String[][] ms = AdoptProjectContext.getModules(webxml); - Map d = (Map)((HashMap)describedModules).clone(); + Map<String,String> d = new HashMap<String, String>(); + d.putAll(describedModules); for (int i = 0; i < ms.length; i++) { String s = (String)d.remove(ms[i][0]); if(s != null && s.equals(ms[i][1])) continue; @@ -119,7 +120,7 @@ describedModules.put(ms[i][0], ms[i][1]); } modified |= d.size() > 0; - Iterator it = d.keySet().iterator(); + Iterator<String> it = d.keySet().iterator(); if(it==null) return false; while(it.hasNext()) describedModules.remove(it.next()); return modified; @@ -128,11 +129,11 @@ private boolean updateInstalledModulesInfo() { boolean modified = false; if(getWebObject() == null) { -// System.out.println("Web object is not found."); return false; } XModelObject[] cs = web.getChildren(WebModulesHelper.ENT_STRUTS_WEB_MODULE); - Map d = (Map)((HashMap)installedModules).clone(); + Map<String,XModelObject> d = new HashMap<String, XModelObject>(); + d.putAll(installedModules); for (int i = 0; i < cs.length; i++) { String n = cs[i].getAttributeValue("name"); //$NON-NLS-1$ XModelObject c = (XModelObject)d.remove(n); @@ -141,18 +142,19 @@ installedModules.put(n, cs[i]); } modified |= d.size() > 0; - Iterator it = d.keySet().iterator(); + Iterator<String> it = d.keySet().iterator(); while(it.hasNext()) installedModules.remove(it.next()); return modified; } private void updateModulesInfo() { modulesMap.clear(); - Map d = (Map)((HashMap)installedModules).clone(); - Iterator it = describedModules.keySet().iterator(); + Map<String,XModelObject> d = new HashMap<String, XModelObject>(); + d.putAll(installedModules); + Iterator<String> it = describedModules.keySet().iterator(); while(it.hasNext()) { - String n = (String)it.next(); - String uri = (String)describedModules.get(n); + String n = it.next(); + String uri = describedModules.get(n); WebModuleImpl m = (WebModuleImpl)d.remove(n); if(m == null) { m = (WebModuleImpl)adoptContext.createModuleInfo(model, n, uri, webinf, false); @@ -168,8 +170,8 @@ } it = d.keySet().iterator(); while(it.hasNext()) { - String n = (String)it.next(); - XModelObject m = (XModelObject)d.get(n); + String n = it.next(); + XModelObject m = d.get(n); setAbsolutePaths(m); m = m.copy(); m.set("state", "deleted"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -313,7 +315,8 @@ try { checkStrutsConfig(path); } catch (Exception e) { - StrutsModelPlugin.getPluginLog().logError(e); + //Do not log this exception. It is thrown to be showed + //in wizard as user input error. return e.getMessage(); } } @@ -377,9 +380,7 @@ ///validateAttributes(); collectOldFileSystems(); servlet = StrutsWebHelper.getServlet(webxml); - Iterator it = modulesMap.keySet().iterator(); - while(it.hasNext()) { - String n = (String)it.next(); + for (String n: modulesMap.keySet()) { // String view_n = getModuleDisplayName(n); XModelObject o = (XModelObject)modulesMap.get(n); if(executeDeleteA(o) == 1) continue; @@ -396,10 +397,8 @@ } private boolean checkNewPaths() { - Iterator it = modulesMap.keySet().iterator(); Set<String> checkedPaths = new HashSet<String>(); - while(it.hasNext()) { - String n = (String)it.next(); + for (String n: modulesMap.keySet()) { // String view_n = getModuleDisplayName(n); XModelObject o = (XModelObject)modulesMap.get(n); if("deleted".equals(o.get("state"))) continue; //$NON-NLS-1$ //$NON-NLS-2$ @@ -452,9 +451,7 @@ } private void executeDelete() { - Iterator it = oldFileSystems.values().iterator(); - while(it.hasNext()) { - XModelObject fs = (XModelObject)it.next(); + for (XModelObject fs: oldFileSystems.values()) { if(fs != null && fs.isActive()) { if("WEB-ROOT".equals(fs.getAttributeValue("name"))) continue; //$NON-NLS-1$ //$NON-NLS-2$ DefaultRemoveHandler.removeFromParent(fs); @@ -462,10 +459,8 @@ } oldFileSystems.clear(); newFileSystems.clear(); - it = modulesMap.keySet().iterator(); - while(it.hasNext()) { - String n = (String)it.next(); - XModelObject o = (XModelObject)modulesMap.get(n); + for (String n: modulesMap.keySet()) { + XModelObject o = modulesMap.get(n); if("deleted".equals(o.get("state"))) deleteModule(n); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -640,9 +635,7 @@ replacedSrc.clear(); oldFileSystems.clear(); newFileSystems.clear(); - Iterator it = installedModules.keySet().iterator(); - while(it.hasNext()) { - String n = (String)it.next(); + for (String n: installedModules.keySet()) { XModelObject m = (XModelObject)installedModules.get(n); collectOldFileSystem(m, ATTR_ROOT_FS); collectOldFileSystem(m, ATTR_SRC_FS); @@ -662,7 +655,7 @@ private void removeObsoleteModules() { - Iterator it = installedModules.keySet().iterator(); + Iterator<String> it = installedModules.keySet().iterator(); while(it.hasNext()) { String n = (String)it.next(); String uri = (String)describedModules.get(n); @@ -683,9 +676,7 @@ removeObsoleteModules(); if(describedModules.size() != installedModules.size()) return StrutsUIMessages.MODULES_DESCRIBED_IN_WEBXML_ARENT_SYNCHRONIZED; - Iterator it = installedModules.keySet().iterator(); - while(it.hasNext()) { - String n = (String)it.next(); + for (String n: installedModules.keySet()) { String uri = (String)describedModules.get(n); if(uri == null) return NLS.bind(StrutsUIMessages.MODULE_DOESNT_DEFINE_URI,getModuleDisplayName(n)); WebModuleImpl m = (WebModuleImpl)installedModules.get(n); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/PostfixUrlPattern.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/PostfixUrlPattern.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/PostfixUrlPattern.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -35,7 +35,7 @@ return path; } - public String getModule(String path, Set modules, String thisModule) { + public String getModule(String path, Set<String> modules, String thisModule) { if(path == null || path.length() < 2 || path.startsWith("//")) return ""; int i = path.indexOf("/", 1); if(i < 0) return thisModule; Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/PrefixUrlPattern.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/PrefixUrlPattern.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/PrefixUrlPattern.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -33,7 +33,7 @@ ? path : (!path.startsWith("/")) ? prefix + path : prefix + path.substring(1); } - public String getModule(String path, Set modules, String thisModule) { + public String getModule(String path, Set<String> modules, String thisModule) { if(path == null || path.length() < 2 || path.startsWith("//")) return ""; int i0 = path.startsWith(prefix) ? prefix.length() : 1; int i = path.indexOf('/', i0); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/UrlPattern.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/UrlPattern.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/pattern/UrlPattern.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -16,7 +16,7 @@ public boolean isActionUrl(String path); public String getActionPath(String url); public String getActionUrl(String path); - public String getModule(String path, Set modules, String thisModule); + public String getModule(String path, Set<String> modules, String thisModule); public String getContextRelativePath(String path, String module); public String getModuleRelativePath(String path, String module); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/resource/ResourceMapping.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/resource/ResourceMapping.java 2008-03-25 14:02:00 UTC (rev 7107) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/resource/ResourceMapping.java 2008-03-25 14:16:56 UTC (rev 7108) @@ -32,13 +32,11 @@ createInfos(modules); } - private boolean isUpToDate(Set modules) { + private boolean isUpToDate(Set<String> modules) { if(modules.size() != infos.size()) return false; - Iterator it = modules.iterator(); boolean result = true; - while(it.hasNext()) { - Object key = it.next(); - ConfigInfo i = (ConfigInfo)infos.get(key); + for (String key: modules) { + ConfigInfo i = infos.get(key); if(i == null) { result = false; } else if(!i.isUpToDate()) {