Author: scabanovich Date: 2011-12-15 14:28:35 -0500 (Thu, 15 Dec 2011) New Revision: 37362 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ThreadSafeCopyFactory.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java Log: System.out.print removed. Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java 2011-12-15 19:28:03 UTC (rev 37361) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/XActionListImpl.java 2011-12-15 19:28:35 UTC (rev 37362) @@ -16,6 +16,7 @@ import org.jboss.tools.common.meta.action.*; import org.jboss.tools.common.meta.impl.*; import org.jboss.tools.common.model.XModelObjectConstants; +import org.jboss.tools.common.model.plugin.ModelPlugin; public class XActionListImpl extends XActionItemImpl implements XActionList { private XActionItem[] items; @@ -65,7 +66,7 @@ public XActionItem getItem(String name) { if(name == null) { - System.out.println("XActionListImpl.getItem: name=null"); //$NON-NLS-1$ + ModelPlugin.getDefault().logWarning("XActionListImpl.getItem: name=null"); //$NON-NLS-1$ } for (int i = 0; i < items.length; i++) { if(items[i].getName().equals(name)) return items[i]; @@ -120,8 +121,6 @@ XActionItem item = ((XActionListImpl)entity.getActionList()).findItem(path); if(item != null) { list.add(item.copy(Acceptor.DEFAULT)); - } else { -// System.out.println("Cannot find path " + path); } } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java 2011-12-15 19:28:03 UTC (rev 37361) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/MetaLibLoader.java 2011-12-15 19:28:35 UTC (rev 37362) @@ -69,13 +69,10 @@ load(path, url); } -// long t = System.currentTimeMillis(); for (int i = 0; i < metarefs.size(); i++) { ModuleRef r = metarefs.get(i); load(r.element, r.name, r.info); } -// long dt = - t + (t = System.currentTimeMillis()); -// System.out.println("Loaded from elements in " + dt + " ms"); } void sift(Set modules) { @@ -126,8 +123,6 @@ } } -// long dt = - t + (t = System.currentTimeMillis()); -// System.out.println("Loaded " + url + " in " + dt + " ms"); if(validateMetaXML) { InputStream stream3 = null; try { @@ -151,8 +146,6 @@ } } } -// dt = - t + (t = System.currentTimeMillis()); -// System.out.println("Validated " + url + " in " + dt + " ms"); } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java 2011-12-15 19:28:03 UTC (rev 37361) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java 2011-12-15 19:28:35 UTC (rev 37362) @@ -100,9 +100,6 @@ XActionList al = es[i].getActionList(); makeActionList(al, actionMenuNames); } - System.out.println("------> Attributes=" + attNames.size() + " (total " + attrCount + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - System.out.println("------> List values=" + listValues.size()); //$NON-NLS-1$ - System.out.println("------> Action menu names=" + actionMenuNames.size()); //$NON-NLS-1$ } private void makeActionList(XActionList list, Set<String> actionMenuNames) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2011-12-15 19:28:03 UTC (rev 37361) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2011-12-15 19:28:35 UTC (rev 37362) @@ -106,7 +106,6 @@ if(s == null || !s.startsWith(XModelConstants.WORKSPACE_OLD_REF)) continue; s = XModelConstants.WORKSPACE_REF + s.substring(XModelConstants.WORKSPACE_OLD_REF.length()); os[i].setAttributeValue(XModelObjectConstants.ATTR_NAME_LOCATION, s); -// System.out.println("Migrated " + s); } removeMissingJarSystems(object); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2011-12-15 19:28:03 UTC (rev 37361) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2011-12-15 19:28:35 UTC (rev 37362) @@ -186,7 +186,6 @@ if(!rs[i].isLinked()) continue; File f = toFile(rs[i]); if(f == null) { -// System.out.println("no location at link " + rs[i]); continue; } linked.registerResource(rs[i]); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ThreadSafeCopyFactory.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ThreadSafeCopyFactory.java 2011-12-15 19:28:03 UTC (rev 37361) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/ThreadSafeCopyFactory.java 2011-12-15 19:28:35 UTC (rev 37362) @@ -61,7 +61,6 @@ copy = ((FolderImpl)object.getParent()).createValidChildCopy(object); } if(copy != null) { -// System.out.println("Created copy of " + copy.getPath() + " for thread " + Thread.currentThread() + ". Main object is being loaded by thread " + loadingThread); //Let us wait a bit for this object, maybe there is no lock. for (int i = 0; i < 5; i++) { if(loadingThread != null && !loadingThread.isAlive()) { @@ -74,7 +73,6 @@ //ignore } if(loadingThread == null) { -// System.out.println("Drop copy of " + FileAnyImpl.toFileName(copy) + " for thread " + Thread.currentThread() + ". Main object is loaded while it was built in " + (i * 100) + " ms."); return null; } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java 2011-12-15 19:28:03 UTC (rev 37361) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XMLRecognizerContext.java 2011-12-15 19:28:35 UTC (rev 37362) @@ -122,7 +122,6 @@ doctypeInfo.systemId = dt.getSystemId(); doctypeInfo.name = dt.getName(); doctypes.put(docTypeString, doctypeInfo); - // System.out.println("" + doctypes.size() + " " + // doctypeInfo.publicId + " " + doctypeInfo.systemId + " " + // doctypeInfo.name); return doctypeInfo; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java 2011-12-15 19:28:03 UTC (rev 37361) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/EncodedProperties.java 2011-12-15 19:28:35 UTC (rev 37362) @@ -69,7 +69,6 @@ valueStart = limit; hasSep = false; - //System.out.println("line=<" + new String(lineBuf, 0, limit) + ">"); precedingBackslash = false; while (keyLen < limit) { c = lr.lineBuf[keyLen]; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-12-15 19:28:03 UTC (rev 37361) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-12-15 19:28:35 UTC (rev 37362) @@ -247,7 +247,7 @@ } return false; } - static int count = 0; + public static IModelNature getModelNature(IProject p) { if(p == null || !p.isOpen()) return null; String[] natures = getModelNatureNames(); @@ -255,13 +255,11 @@ try { if(p.hasNature(natures[i])) { long t1 = System.currentTimeMillis(); - count++; + if(!ModelNature.checkModelNature(p, natures[i])) { continue; } - long dt = System.currentTimeMillis() - t1; - count += (int)dt; -// System.out.println("--->" + count); + IModelNature n = (IModelNature)p.getNature(natures[i]); if(n == null) return null; n = testNature(n); @@ -437,7 +435,6 @@ if(!cs[i].isAccessible()) continue; if(resources.contains(cs[i])) continue; if(cs[i].getLocation() == null) { -// System.out.println("no location at link " + cs[i]); continue; } if(cs[i].getLocation().toFile() == null || !cs[i].getLocation().toFile().isDirectory()) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java 2011-12-15 19:28:03 UTC (rev 37361) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java 2011-12-15 19:28:35 UTC (rev 37362) @@ -41,8 +41,8 @@ result = instance.createImageDescriptor(key).createImage(); if(result != null) { synchronized (registry) { - ModelPlugin.getDefault().getImageRegistry().remove(key); - ModelPlugin.getDefault().getImageRegistry().put(key, result); + registry.remove(key); + registry.put(key, result); } } }