JBoss Tools SVN: r43891 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/internal.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-20 19:58:44 -0400 (Thu, 20 Sep 2012)
New Revision: 43891
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/internal/LinkCollection.java
Log:
JBIDE-12479
https://issues.jboss.org/browse/JBIDE-12479
Cache unique Path objects.
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/internal/LinkCollection.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/internal/LinkCollection.java 2012-09-20 23:58:05 UTC (rev 43890)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/internal/LinkCollection.java 2012-09-20 23:58:44 UTC (rev 43891)
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.jboss.tools.common.el.core.ELReference;
+import org.jboss.tools.common.util.UniquePaths;
import org.jboss.tools.common.validation.ValidationMessages;
import org.jboss.tools.common.xml.XMLUtilities;
import org.w3c.dom.Element;
@@ -54,6 +55,8 @@
if(variableName==null) {
throw new IllegalArgumentException(ValidationMessages.VALIDATION_CONTEXT_VARIABLE_NAME_MUST_NOT_BE_NULL);
}
+
+ linkedResourcePath = UniquePaths.getInstance().intern(linkedResourcePath);
if(resourcesByVariableName != null) {
synchronized(this) {
@@ -70,15 +73,18 @@
}
}
+ Set<String> variableNames = null;
// Save link between resource and variable names. It's needed if variable name changes in resource file.
- Set<String> variableNames = variableNamesByResource.get(linkedResourcePath);
- if(variableNames==null) {
- variableNames = new HashSet<String>();
- variableNamesByResource.put(linkedResourcePath, variableNames);
+ synchronized(this) {
+ variableNames = variableNamesByResource.get(linkedResourcePath);
+ if(variableNames==null) {
+ variableNames = new HashSet<String>();
+ variableNamesByResource.put(linkedResourcePath, variableNames);
+ }
+ if(variableNames.add(variableName.intern())) {
+ modifications++;
+ }
}
- if(variableNames.add(variableName.intern())) {
- modifications++;
- }
if(declaration) {
synchronized(this) {
13 years, 6 months
JBoss Tools SVN: r43890 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-20 19:58:05 -0400 (Thu, 20 Sep 2012)
New Revision: 43890
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java
Log:
JBIDE-12479
https://issues.jboss.org/browse/JBIDE-12479
Cache unique Path objects.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java 2012-09-20 23:56:14 UTC (rev 43889)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java 2012-09-20 23:58:05 UTC (rev 43890)
@@ -32,6 +32,7 @@
import org.jboss.tools.common.el.core.parser.SyntaxError;
import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.common.util.UniquePaths;
import org.w3c.dom.Element;
/**
@@ -132,7 +133,7 @@
* @param path the path to set
*/
public void setPath(IPath path) {
- this.path = path;
+ this.path = UniquePaths.getInstance().intern(path);
}
public String getSourceText() {
13 years, 6 months
JBoss Tools SVN: r43889 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-20 19:56:14 -0400 (Thu, 20 Sep 2012)
New Revision: 43889
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
Log:
JBIDE-12479
https://issues.jboss.org/browse/JBIDE-12479
Cache unique Path objects.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java 2012-09-20 23:50:49 UTC (rev 43888)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java 2012-09-20 23:56:14 UTC (rev 43889)
@@ -55,7 +55,7 @@
protected KbObject parent;
//locations of xml attributes
- protected Map<String,IValueInfo> attributesInfo = new HashMap<String, IValueInfo>();
+ protected Map<String,IValueInfo> attributesInfo = new HashMap<String, IValueInfo>(8);
public KbObject() {}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2012-09-20 23:50:49 UTC (rev 43888)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2012-09-20 23:56:14 UTC (rev 43889)
@@ -36,6 +36,7 @@
import org.jboss.tools.common.model.project.ext.event.Change;
import org.jboss.tools.common.model.project.ext.store.XMLStoreConstants;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.util.UniquePaths;
import org.jboss.tools.common.validation.IProjectValidationContext;
import org.jboss.tools.common.validation.internal.ProjectValidationContext;
import org.jboss.tools.common.xml.XMLUtilities;
@@ -748,6 +749,7 @@
* @param source
*/
public void registerComponents(LoadedDeclarations ds, IPath source) {
+ source = UniquePaths.getInstance().intern(source);
boolean isThisProject = pathCheck.isThisProject(source);
ITagLibrary[] libraries = ds.getLibraries().toArray(new ITagLibrary[0]);
13 years, 6 months
JBoss Tools SVN: r43888 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-20 19:50:49 -0400 (Thu, 20 Sep 2012)
New Revision: 43888
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
Log:
JBIDE-12479
https://issues.jboss.org/browse/JBIDE-12479
Cache unique Path objects.
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java 2012-09-20 23:50:05 UTC (rev 43887)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java 2012-09-20 23:50:49 UTC (rev 43888)
@@ -36,6 +36,7 @@
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelObjectUtil;
+import org.jboss.tools.common.util.UniquePaths;
/**
*
@@ -299,7 +300,7 @@
paths2.clear();
if(paths != null) {
for (String p : paths) {
- paths2.put(new Path(p), p);
+ paths2.put(UniquePaths.getInstance().intern(new Path(p)), p);
}
}
}
13 years, 6 months
JBoss Tools SVN: r43887 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-20 19:50:05 -0400 (Thu, 20 Sep 2012)
New Revision: 43887
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/Dependencies.java
Log:
JBIDE-12479
https://issues.jboss.org/browse/JBIDE-12479
Cache unique Path objects.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2012-09-20 23:37:49 UTC (rev 43886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2012-09-20 23:50:05 UTC (rev 43887)
@@ -55,6 +55,7 @@
import org.jboss.tools.common.model.project.ProjectHome;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.util.UniquePaths;
import org.jboss.tools.common.web.WebUtils;
public class CDICoreBuilder extends IncrementalProjectBuilder {
@@ -244,6 +245,8 @@
} finally {
n.fireChanges();
}
+
+ resourceVisitor = null;
return null;
}
@@ -442,6 +445,7 @@
public boolean visit(IResource resource) throws CoreException {
IPath path = resource.getFullPath();
+ path = UniquePaths.getInstance().intern(path);
if(resource instanceof IFile) {
if(visited.contains(path)) {
return false;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2012-09-20 23:37:49 UTC (rev 43886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2012-09-20 23:50:05 UTC (rev 43887)
@@ -21,6 +21,7 @@
import org.jboss.tools.cdi.core.extension.CDIExtensionManager;
import org.jboss.tools.common.java.ParametedType;
import org.jboss.tools.common.java.ParametedTypeFactory;
+import org.jboss.tools.common.util.UniquePaths;
/**
*
@@ -90,7 +91,11 @@
}
public void setSourcePath(IPath source) {
+ if(source != null) {
+ source = UniquePaths.getInstance().intern(source);
+ }
this.source = source;
+
}
@Override
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2012-09-20 23:37:49 UTC (rev 43886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2012-09-20 23:50:05 UTC (rev 43887)
@@ -53,7 +53,6 @@
protected List<IAnnotationDeclaration> annotations = new ArrayList<IAnnotationDeclaration>(2);
protected IAnnotatable member;
private IAnnotationMap annotationsByType = EmptyMap.instance;
- protected IResource resource;
protected ITextSourceReference originalDefinition = null;
@@ -98,7 +97,6 @@
protected void init(IType contextType, IRootDefinitionContext context, int flags) throws CoreException {
project = context.getProject();
- resource = ((IJavaElement)member).getResource();
if((flags & FLAG_NO_ANNOTATIONS) == 0) {
IAnnotation[] ts = member.getAnnotations();
for (int i = 0; i < ts.length; i++) {
@@ -118,6 +116,7 @@
protected void addDependency(IMember reference, IRootDefinitionContext context) {
if(reference == null || reference.isBinary()) return;
+ IResource resource = getResource();
if(!(resource instanceof IFile)) return;
IFile target = (IFile)resource;
IFile source = (IFile)reference.getResource();
@@ -227,7 +226,7 @@
}
public IResource getResource() {
- return resource;
+ return ((IJavaElement)member).getResource();
}
public ITextSourceReference getOriginalDefinition() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2012-09-20 23:37:49 UTC (rev 43886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2012-09-20 23:50:05 UTC (rev 43887)
@@ -14,9 +14,9 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
@@ -121,6 +121,7 @@
public String getContent() {
if(type == null || type.isBinary()) return null;
+ IResource resource = getResource();
if(resource instanceof IFile && resource.getName().endsWith(".java")) {
return FileUtil.getContentFromEditorOrFile((IFile)resource);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2012-09-20 23:37:49 UTC (rev 43886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2012-09-20 23:50:05 UTC (rev 43887)
@@ -26,6 +26,7 @@
import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension;
import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedTypeFeature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.util.UniquePaths;
/**
*
@@ -166,6 +167,7 @@
public void addPackage(IPath file, String packageName, PackageDefinition def) {
if(file != null) {
+ file = UniquePaths.getInstance().intern(file);
Set<String> ts = resources.get(file);
if(ts == null) {
ts = new HashSet<String>();
@@ -192,6 +194,7 @@
public void addType(IPath file, String typeName) {
if(file != null) {
+ file = UniquePaths.getInstance().intern(file);
Set<String> ts = resources.get(file);
if(ts == null) {
ts = new HashSet<String>();
@@ -212,7 +215,7 @@
q = q.removeLastSegments(1);
Set<IPath> cs = childPaths.get(q);
if(cs == null) {
- childPaths.put(q, cs = new HashSet<IPath>());
+ childPaths.put(UniquePaths.getInstance().intern(q), cs = new HashSet<IPath>());
}
cs.add(file);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/Dependencies.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/Dependencies.java 2012-09-20 23:37:49 UTC (rev 43886)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/Dependencies.java 2012-09-20 23:50:05 UTC (rev 43887)
@@ -16,6 +16,7 @@
import java.util.Set;
import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.common.util.UniquePaths;
public class Dependencies {
protected Map<IPath, Set<IPath>> direct = new HashMap<IPath, Set<IPath>>();
@@ -24,6 +25,8 @@
public Dependencies() {}
public void addDependency(IPath source, IPath target) {
+ source = UniquePaths.getInstance().intern(source);
+ target = UniquePaths.getInstance().intern(target);
Set<IPath> ps = direct.get(source);
if(ps == null) {
ps = new HashSet<IPath>();
13 years, 6 months
JBoss Tools SVN: r43886 - trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-20 19:37:49 -0400 (Thu, 20 Sep 2012)
New Revision: 43886
Added:
trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/UniquePaths.java
Log:
JBIDE-12479
https://issues.jboss.org/browse/JBIDE-12479
Cache unique Path objects.
Added: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/UniquePaths.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/UniquePaths.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/UniquePaths.java 2012-09-20 23:37:49 UTC (rev 43886)
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.util;
+
+import java.util.Hashtable;
+
+import org.eclipse.core.runtime.IPath;
+
+/**
+ *
+ * Even a huge workspace contains much less than 100000 paths, whereas even in a middle
+ * workspace with about 10000 paths as much as 250000 instances of Path are kept in various
+ * caches.
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class UniquePaths {
+ static UniquePaths instance = new UniquePaths();
+
+ public static UniquePaths getInstance() {
+ return instance;
+ }
+
+ Hashtable<IPath, IPath> paths = new Hashtable<IPath, IPath>();
+
+ private UniquePaths() {}
+
+ public IPath intern(IPath path) {
+ IPath result = paths.get(path);
+ if(result == null) {
+ paths.put(path, path);
+ result = path;
+ if(paths.size() % 100 == 0) System.out.println("--->" + paths.size());
+ }
+ return result;
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/UniquePaths.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 6 months
JBoss Tools SVN: r43885 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/project/ext/store.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-20 19:19:55 -0400 (Thu, 20 Sep 2012)
New Revision: 43885
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/project/ext/store/XMLValueInfo.java
Log:
JBIDE-12479
https://issues.jboss.org/browse/JBIDE-12479
Reduce number of cached strings.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/project/ext/store/XMLValueInfo.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/project/ext/store/XMLValueInfo.java 2012-09-20 20:28:31 UTC (rev 43884)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/project/ext/store/XMLValueInfo.java 2012-09-20 23:19:55 UTC (rev 43885)
@@ -10,11 +10,9 @@
******************************************************************************/
package org.jboss.tools.jst.web.model.project.ext.store;
-import java.io.File;
import java.util.Properties;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.project.ext.IValueInfo;
import org.jboss.tools.common.model.project.ext.store.XMLStoreConstants;
@@ -36,7 +34,7 @@
public XMLValueInfo(XModelObject object, String attribute) {
this.object = object;
- this.attribute = attribute;
+ this.attribute = attribute.intern();
}
public int getLength() {
13 years, 6 months
JBoss Tools SVN: r43884 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-20 16:28:31 -0400 (Thu, 20 Sep 2012)
New Revision: 43884
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
Log:
JBIDE-12479
https://issues.jboss.org/browse/JBIDE-12479
Reduce number of cached strings.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2012-09-20 20:26:57 UTC (rev 43883)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2012-09-20 20:28:31 UTC (rev 43884)
@@ -171,6 +171,7 @@
ts = new HashSet<String>();
resources.put(file, ts);
}
+ packageName = packageName.intern();
ts.add(packageName);
packages.add(packageName);
addToParents(file);
@@ -196,6 +197,7 @@
ts = new HashSet<String>();
resources.put(file, ts);
}
+ typeName = typeName.intern();
ts.add(typeName);
types.add(typeName);
addToParents(file);
13 years, 6 months
JBoss Tools SVN: r43883 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: internal and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-20 16:26:57 -0400 (Thu, 20 Sep 2012)
New Revision: 43883
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/ClassPathMonitor.java
Log:
JBIDE-12479
https://issues.jboss.org/browse/JBIDE-12479
Do not keep EL model objects in ELReference.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-09-20 20:26:21 UTC (rev 43882)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-09-20 20:26:57 UTC (rev 43883)
@@ -304,7 +304,6 @@
elReference.setResource(file);
elReference.setLength(content.length());
elReference.setStartPosition(0);
- elReference.init(content);
context.addELReference(elReference);
}
return context;
@@ -343,7 +342,6 @@
elReference.setResource(file);
elReference.setLength(value.length());
elReference.setStartPosition(offset);
- elReference.init(value);
try {
elReference.setLineNumber(document.getLineOfOffset(startEl));
@@ -795,7 +793,6 @@
elReference.setResource(context.getResource());
elReference.setLength(text.length());
elReference.setStartPosition(offset);
- elReference.init(text);
try {
if(Node.TEXT_NODE == node.getNodeType()) {
if(elReference.getEl().length == 1) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2012-09-20 20:26:21 UTC (rev 43882)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2012-09-20 20:26:57 UTC (rev 43883)
@@ -17,7 +17,6 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -919,10 +918,8 @@
*/
void libraryDeclarationsRemoved(Map<Object,ITagLibrary> removed) {
if(removed == null || removed.isEmpty()) return;
- Iterator<ITagLibrary> iterator = removed.values().iterator();
List<Change> changes = null;
- while(iterator.hasNext()) {
- ITagLibrary c = iterator.next();
+ for(ITagLibrary c: removed.values()) {
libraries.removeLibrary(c);
changes = Change.addChange(changes, new Change(this, null, c, null));
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/ClassPathMonitor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/ClassPathMonitor.java 2012-09-20 20:26:21 UTC (rev 43882)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/ClassPathMonitor.java 2012-09-20 20:26:57 UTC (rev 43883)
@@ -13,7 +13,6 @@
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -34,7 +33,6 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.kb.IKbProject;
-import org.jboss.tools.jst.web.kb.KbMessages;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.internal.KbProject;
import org.jboss.tools.jst.web.model.helpers.InnerModelHelper;
13 years, 6 months
JBoss Tools SVN: r43882 - trunk/modeshape.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-20 16:26:21 -0400 (Thu, 20 Sep 2012)
New Revision: 43882
Added:
trunk/modeshape/README.deprecated.project.marked.read-only.moved.to.github.txt
Log:
add README about modeshape's move to https://github.com/ModeShape/modeshape-tools
Added: trunk/modeshape/README.deprecated.project.marked.read-only.moved.to.github.txt
===================================================================
--- trunk/modeshape/README.deprecated.project.marked.read-only.moved.to.github.txt (rev 0)
+++ trunk/modeshape/README.deprecated.project.marked.read-only.moved.to.github.txt 2012-09-20 20:26:21 UTC (rev 43882)
@@ -0,0 +1,9 @@
+This project is read-only as it has migrated to github.
+
+For editable sources and new development work, see
+
+https://github.com/ModeShape/modeshape-tools
+
+If you need maintance work done on these sources, contact Dan Florian (dflorian(a)redhat.com, elvisisking) or Nick Boldt (nboldt(a)redhat.com, nickboldt) for assistance.
+
+2012-09-20 16:25:30
13 years, 6 months