Author: dgolovin Date: 2007-10-24 20:22:08 -0400 (Wed, 24 Oct 2007) New Revision: 4499 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/EntityComparator.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EntityXMLRegistration.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/FindObjectHelper.java Log: Code clean up. new Integer() replaced for Integer.valueOf() Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2007-10-25 00:22:02 UTC (rev 4498) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2007-10-25 00:22:08 UTC (rev 4499) @@ -287,7 +287,7 @@ synchronized (registered) { io = registered.get(name); if(io == null) { - io = new Integer(registered.size()); + io = Integer.valueOf(registered.size()); registered.put(name, io); } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2007-10-25 00:22:02 UTC (rev 4498) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2007-10-25 00:22:08 UTC (rev 4499) @@ -83,7 +83,7 @@ } String ep = "ERROR: " + FindObjectHelper.makeRef(getPath() + ":" + ln1, ln + ":" + pos) + " " + er; if(iln < 0) markers.lines.remove(ep); - else markers.lines.put(ep, new Integer(iln)); + else markers.lines.put(ep, Integer.valueOf(iln)); sb.append(ep).append('\n'); this.errors[i] = ep; } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/EntityComparator.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/EntityComparator.java 2007-10-25 00:22:02 UTC (rev 4498) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/EntityComparator.java 2007-10-25 00:22:08 UTC (rev 4499) @@ -32,7 +32,7 @@ public EntityComparator(XChild[] c) { entities = new Hashtable<String,Integer>(c.length); for (int i = 0; i < c.length; i++) { - entities.put(c[i].getName(), new Integer(i * 100)); + entities.put(c[i].getName(), Integer.valueOf(i * 100)); } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java 2007-10-25 00:22:02 UTC (rev 4498) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java 2007-10-25 00:22:08 UTC (rev 4499) @@ -382,7 +382,7 @@ public SharableComparator(XChild[] c) { entities = new Hashtable<String,Integer>(c.length); for (int i = 0; i < c.length; i++) { - entities.put(c[i].getName(), new Integer(i * 100)); + entities.put(c[i].getName(), Integer.valueOf(i * 100)); } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EntityXMLRegistration.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EntityXMLRegistration.java 2007-10-25 00:22:02 UTC (rev 4498) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EntityXMLRegistration.java 2007-10-25 00:22:08 UTC (rev 4499) @@ -40,24 +40,24 @@ if(a != null && isResolvingSchema) { return resolveSchema(entity, a); } - resolved.put(entity, new Integer(UNRESOLVED)); + resolved.put(entity, Integer.valueOf(UNRESOLVED)); return UNRESOLVED; } private int resolveDTD(XModelEntity entity, XAttribute a) { String v = a.getDefaultValue(); if(XMLEntityResolver.getInstance().isResolved(v, null)) { - resolved.put(entity, new Integer(DTD)); + resolved.put(entity, Integer.valueOf(DTD)); return DTD; } ExtensibleURIResolver r = new ExtensibleURIResolver(); String s = r.resolve(null, v, null); if(s != null && s.length() > 0) { - resolved.put(entity, new Integer(DTD)); + resolved.put(entity, Integer.valueOf(DTD)); XMLEntityResolver.registerPublicEntity(v, s); return DTD; } - resolved.put(entity, new Integer(MISSING)); + resolved.put(entity, Integer.valueOf(MISSING)); return MISSING; } @@ -65,7 +65,7 @@ String v = a.getDefaultValue(); String[] vs = v.split(" "); if(vs == null || vs.length < 2) { - resolved.put(entity, new Integer(MISSING)); + resolved.put(entity, Integer.valueOf(MISSING)); return MISSING; } String location = null; @@ -81,7 +81,7 @@ location = r.resolve(null, vs[0], vs[1]); } if(location != null && location.length() > 0) { - resolved.put(entity, new Integer(SCHEMA)); + resolved.put(entity, Integer.valueOf(SCHEMA)); return SCHEMA; } return SCHEMA; Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/FindObjectHelper.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/FindObjectHelper.java 2007-10-25 00:22:02 UTC (rev 4498) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/FindObjectHelper.java 2007-10-25 00:22:08 UTC (rev 4499) @@ -35,7 +35,7 @@ public static int findModelObject(XModelObject o, int where) { if(o == null) return 1; SpecialWizard wizard = createSelectWizard(); - wizard.setObject(new Integer(where)); + wizard.setObject(Integer.valueOf(where)); wizard.setObject(o); return wizard.execute(); } @@ -43,7 +43,7 @@ public static int findModelObject(XModelObject o, int where, String preferredPage) { if(o == null) return 1; SpecialWizard wizard = createSelectWizard(); - wizard.setObject(new Integer(where)); + wizard.setObject(Integer.valueOf(where)); wizard.setObject(o); wizard.setObject(preferredPage); return wizard.execute();