JBoss Tools SVN: r31011 - branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-02 15:29:25 -0400 (Mon, 02 May 2011)
New Revision: 31011
Modified:
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8818
Modified: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
===================================================================
--- branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2011-05-02 19:15:11 UTC (rev 31010)
+++ branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2011-05-02 19:29:25 UTC (rev 31011)
@@ -124,15 +124,15 @@
}
rootChange.perform(new NullProgressMonitor());
-
- if(delay > 0)
- JobUtils.waitForIdle(delay);
- else
- JobUtils.waitForIdle();
+//
+// if(delay > 0)
+// JobUtils.waitForIdle(delay);
+// else
+// JobUtils.waitForIdle();
seamProject.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle();
+// JobUtils.waitForIdle();
// Test results
assertNotNull("Can't load component " + newName, seamProject.getComponent(newName));
13 years, 10 months
JBoss Tools SVN: r31010 - branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-05-02 15:15:11 -0400 (Mon, 02 May 2011)
New Revision: 31010
Modified:
branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8818
Modified: branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
===================================================================
--- branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2011-05-02 19:12:22 UTC (rev 31009)
+++ branches/jbosstools-3.2.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2011-05-02 19:15:11 UTC (rev 31010)
@@ -4,6 +4,7 @@
import java.util.List;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.ltk.core.refactoring.CompositeChange;
@@ -128,7 +129,11 @@
JobUtils.waitForIdle(delay);
else
JobUtils.waitForIdle();
-
+
+ seamProject.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+
+ JobUtils.waitForIdle();
+
// Test results
assertNotNull("Can't load component " + newName, seamProject.getComponent(newName));
for(TestChangeStructure changeStructure : changeList){
13 years, 10 months
JBoss Tools SVN: r31009 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core: validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-02 15:12:22 -0400 (Mon, 02 May 2011)
New Revision: 31009
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamTextSourceReference.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
Log:
JBIDE-8832
https://issues.jboss.org/browse/JBIDE-8832
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java 2011-05-02 19:09:26 UTC (rev 31008)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/AbstractSeamDeclaration.java 2011-05-02 19:12:22 UTC (rev 31009)
@@ -76,6 +76,10 @@
public int getStartPosition() {
return valueInfo != null ? valueInfo.getStartPosition() : 0;
}
+
+ public IResource getResource() {
+ return resource;
+ }
};
return reference;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamTextSourceReference.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamTextSourceReference.java 2011-05-02 19:09:26 UTC (rev 31008)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamTextSourceReference.java 2011-05-02 19:12:22 UTC (rev 31009)
@@ -10,19 +10,21 @@
******************************************************************************/
package org.jboss.tools.seam.internal.core;
+import org.eclipse.core.resources.IResource;
import org.jboss.tools.common.text.ITextSourceReference;
/**
* @author Alexey Kazakov
*/
public class SeamTextSourceReference implements ITextSourceReference {
-
+ private IResource resource;
private int length;
private int startPosition;
- public SeamTextSourceReference(int length, int startPosition) {
+ public SeamTextSourceReference(int length, int startPosition, IResource resource) {
this.length = length;
this.startPosition = startPosition;
+ this.resource = resource;
}
/* (non-Javadoc)
@@ -52,4 +54,9 @@
public void setStartPosition(int startPosition) {
this.startPosition = startPosition;
}
+
+ public IResource getResource() {
+ return resource;
+ }
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-05-02 19:09:26 UTC (rev 31008)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-05-02 19:12:22 UTC (rev 31009)
@@ -786,7 +786,7 @@
} catch (JavaModelException e) {
SeamCorePlugin.getDefault().logError(SeamCoreMessages.SEAM_CORE_VALIDATOR_ERROR_VALIDATING_SEAM_CORE, e);
}
- return new SeamTextSourceReference(length, offset);
+ return new SeamTextSourceReference(length, offset, source.getResource());
}
private void validateStatefulComponent(ISeamComponent component) {
13 years, 10 months
JBoss Tools SVN: r31008 - 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: 2011-05-02 15:09:26 -0400 (Mon, 02 May 2011)
New Revision: 31008
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/project/ext/store/XMLValueInfo.java
Log:
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 2011-05-02 19:08:25 UTC (rev 31007)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/project/ext/store/XMLValueInfo.java 2011-05-02 19:09:26 UTC (rev 31008)
@@ -10,8 +10,11 @@
******************************************************************************/
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;
@@ -77,5 +80,9 @@
attribute = element.getAttribute("attr"); //$NON-NLS-1$
object = XMLStoreHelper.loadModelObject(element, "object", context); //$NON-NLS-1$
}
+
+ public IFile getResource() {
+ return object == null ? null : (IFile)object.getAdapter(File.class);
+ }
}
13 years, 10 months
JBoss Tools SVN: r31007 - trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-02 15:08:25 -0400 (Mon, 02 May 2011)
New Revision: 31007
Modified:
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
Log:
JBIDE-8832
https://issues.jboss.org/browse/JBIDE-8832
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2011-05-02 19:07:32 UTC (rev 31006)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2011-05-02 19:08:25 UTC (rev 31007)
@@ -1,5 +1,6 @@
package org.jboss.tools.esb.validator;
+import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -391,4 +392,8 @@
public void loadXML(Element element, Properties context) {
}
+ public IFile getResource() {
+ return object == null ? null : (IFile)object.getAdapter(File.class);
+ }
+
}
13 years, 10 months
JBoss Tools SVN: r31006 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-02 15:07:32 -0400 (Mon, 02 May 2011)
New Revision: 31006
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/impl/ValueInfo.java
Log:
JBIDE-8832
https://issues.jboss.org/browse/JBIDE-8832
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/impl/ValueInfo.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/impl/ValueInfo.java 2011-05-02 19:06:00 UTC (rev 31005)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/impl/ValueInfo.java 2011-05-02 19:07:32 UTC (rev 31006)
@@ -14,6 +14,7 @@
import java.util.List;
import java.util.Properties;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.IMemberValuePair;
@@ -32,6 +33,7 @@
import org.w3c.dom.Element;
public class ValueInfo implements IValueInfo {
+ IFile resource;
String value;
public int valueStartPosition;
public int valueLength;
@@ -77,6 +79,9 @@
public static ValueInfo getValueInfo(IAnnotation annotation, String name) {
if(name == null) name = "value"; //$NON-NLS-1$
ValueInfo result = new ValueInfo();
+ if(annotation.getResource() instanceof IFile) {
+ result.setResource((IFile)annotation.getResource());
+ }
ISourceRange r = null;
IMemberValuePair[] ps = null;
try {
@@ -162,4 +167,13 @@
}
}
}
+
+ public void setResource(IFile resource) {
+ this.resource = resource;
+ }
+
+ public IFile getResource() {
+ return resource;
+ }
+
}
13 years, 10 months
JBoss Tools SVN: r31005 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-02 15:06:00 -0400 (Mon, 02 May 2011)
New Revision: 31005
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegmentImpl.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java
Log:
JBIDE-8832
https://issues.jboss.org/browse/JBIDE-8832
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegmentImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegmentImpl.java 2011-05-02 19:05:25 UTC (rev 31004)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELSegmentImpl.java 2011-05-02 19:06:00 UTC (rev 31005)
@@ -47,6 +47,9 @@
public int getLength() {
return token.getLength();
}
+ public IResource getResource() {
+ return resource;
+ }
};
}
return sourceReference;
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2011-05-02 19:05:25 UTC (rev 31004)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2011-05-02 19:06:00 UTC (rev 31005)
@@ -54,6 +54,9 @@
public int getLength() {
return propertyLength;
}
+ public IResource getResource() {
+ return resource;
+ }
};
}
return messagePropertySourceReference;
13 years, 10 months
JBoss Tools SVN: r31004 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-02 15:05:25 -0400 (Mon, 02 May 2011)
New Revision: 31004
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/ITextSourceReference.java
Log:
JBIDE-8832
https://issues.jboss.org/browse/JBIDE-8832
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/ITextSourceReference.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/ITextSourceReference.java 2011-05-02 19:04:27 UTC (rev 31003)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/ITextSourceReference.java 2011-05-02 19:05:25 UTC (rev 31004)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.common.text;
+import org.eclipse.core.resources.IResource;
+
/**
* An interface of seam tools model object that has text source.
* @author Alexey Kazakov
@@ -25,4 +27,11 @@
* @return number of characters of element in text
*/
int getLength();
+
+ /**
+ *
+ * @return resource to which this object references; may return null, if this object references source that is not a IResource object
+ */
+ IResource getResource();
+
}
\ No newline at end of file
13 years, 10 months
JBoss Tools SVN: r31003 - trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-02 15:04:27 -0400 (Mon, 02 May 2011)
New Revision: 31003
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java
Log:
JBIDE-8832
https://issues.jboss.org/browse/JBIDE-8832
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-05-02 19:04:14 UTC (rev 31002)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-05-02 19:04:27 UTC (rev 31003)
@@ -40,6 +40,7 @@
import org.jboss.tools.cdi.seam.config.core.definition.SeamMethodDefinition;
import org.jboss.tools.cdi.seam.config.core.definition.SeamParameterDefinition;
import org.jboss.tools.cdi.seam.config.core.definition.SeamVirtualFieldDefinition;
+import org.jboss.tools.cdi.seam.config.core.scanner.Location;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
import org.jboss.tools.common.text.ITextSourceReference;
@@ -59,7 +60,7 @@
Set<SeamBeanDefinition> ds = findBeanDefinitionByTagName(d, "test602:Report");
assertEquals(1, ds.size());
SeamBeanDefinition report = ds.iterator().next();
- ITextSourceReference modifies = report.getModifiesLocation();
+ Location modifies = report.getModifiesLocation();
assertNotNull(modifies);
IJavaAnnotation annotation = report.getAnnotation("org.jboss.test602.report.NewQualifier");
assertNotNull(annotation);
@@ -67,7 +68,7 @@
ds = findBeanDefinitionByTagName(d, "test602:ReportDatasource");
assertEquals(1, ds.size());
SeamBeanDefinition reportDatasource = ds.iterator().next();
- ITextSourceReference replaces = reportDatasource.getReplacesLocation();
+ Location replaces = reportDatasource.getReplacesLocation();
assertNotNull(replaces);
}
13 years, 10 months
JBoss Tools SVN: r31002 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core: scanner and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-02 15:04:14 -0400 (Mon, 02 May 2011)
New Revision: 31002
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/Location.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXNode.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java
Log:
JBIDE-8832
https://issues.jboss.org/browse/JBIDE-8832
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java 2011-05-02 19:03:27 UTC (rev 31001)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/definition/SeamMemberDefinition.java 2011-05-02 19:04:14 UTC (rev 31002)
@@ -14,9 +14,9 @@
import java.util.Map;
import org.jboss.tools.cdi.core.IJavaAnnotation;
+import org.jboss.tools.cdi.seam.config.core.scanner.Location;
import org.jboss.tools.cdi.seam.config.core.scanner.SAXElement;
import org.jboss.tools.cdi.seam.config.core.scanner.SAXNode;
-import org.jboss.tools.common.text.ITextSourceReference;
/**
*
@@ -59,11 +59,11 @@
return annotations.get(typeName);
}
- public ITextSourceReference getReplacesLocation() {
+ public Location getReplacesLocation() {
return replaces == null ? null : replaces.getLocation();
}
- public ITextSourceReference getModifiesLocation() {
+ public Location getModifiesLocation() {
return modifies == null ? null : modifies.getLocation();
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/Location.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/Location.java 2011-05-02 19:03:27 UTC (rev 31001)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/Location.java 2011-05-02 19:04:14 UTC (rev 31002)
@@ -10,14 +10,15 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.config.core.scanner;
-import org.jboss.tools.common.text.ITextSourceReference;
+import org.eclipse.core.resources.IFile;
/**
*
* @author Viacheslav Kabanovich
*
*/
-public class Location implements ITextSourceReference {
+public class Location {
+ IFile file;
int start;
int length;
@@ -34,4 +35,8 @@
return length;
}
+ public IFile getResource() {
+ return file;
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java 2011-05-02 19:03:27 UTC (rev 31001)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXAttribute.java 2011-05-02 19:04:14 UTC (rev 31002)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.config.core.scanner;
-import org.jboss.tools.common.text.ITextSourceReference;
-
/**
*
* @author Viacheslav Kabanovich
@@ -19,7 +17,7 @@
*/
public class SAXAttribute extends SAXText {
private String name;
- private ITextSourceReference nameLocation;
+ private Location nameLocation;
private SAXElement parent;
@@ -31,19 +29,19 @@
return name;
}
- public void setNameLocation(ITextSourceReference location) {
+ public void setNameLocation(Location location) {
nameLocation = location;
}
- public ITextSourceReference getNameLocation() {
+ public Location getNameLocation() {
return nameLocation;
}
- public void setValueLocation(ITextSourceReference location) {
+ public void setValueLocation(Location location) {
setLocation(location);
}
- public ITextSourceReference getValueLocation() {
+ public Location getValueLocation() {
return getLocation();
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXElement.java 2011-05-02 19:03:27 UTC (rev 31001)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXElement.java 2011-05-02 19:04:14 UTC (rev 31002)
@@ -16,8 +16,6 @@
import java.util.Map;
import java.util.Set;
-import org.jboss.tools.common.text.ITextSourceReference;
-
/**
*
* @author Viacheslav Kabanovich
@@ -27,7 +25,7 @@
protected String uri;
protected String localName;
protected String name;
- protected ITextSourceReference nameLocation;
+ protected Location nameLocation;
protected Map<String, SAXAttribute> attributes = new HashMap<String, SAXAttribute>();
protected SAXText text;
@@ -44,11 +42,11 @@
return name;
}
- public void setNameLocation(ITextSourceReference location) {
+ public void setNameLocation(Location location) {
nameLocation = location;
}
- public ITextSourceReference getNameLocation() {
+ public Location getNameLocation() {
return nameLocation;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXNode.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXNode.java 2011-05-02 19:03:27 UTC (rev 31001)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXNode.java 2011-05-02 19:04:14 UTC (rev 31002)
@@ -10,21 +10,19 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.config.core.scanner;
-import org.jboss.tools.common.text.ITextSourceReference;
-
/**
*
* @author Viacheslav Kabanovich
*
*/
public class SAXNode {
- protected ITextSourceReference location = null;
+ protected Location location = null;
- public void setLocation(ITextSourceReference location) {
+ public void setLocation(Location location) {
this.location = location;
}
- public ITextSourceReference getLocation() {
+ public Location getLocation() {
return location;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java 2011-05-02 19:03:27 UTC (rev 31001)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SAXParser.java 2011-05-02 19:04:14 UTC (rev 31002)
@@ -8,7 +8,6 @@
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.jboss.tools.common.CommonPlugin;
-import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.common.xml.SAXValidator;
import org.jboss.tools.common.xml.XMLEntityResolverImpl;
import org.xml.sax.Attributes;
@@ -82,7 +81,7 @@
SAXElement current = null;
StringBuffer currentText = new StringBuffer();
- ITextSourceReference currentTextLocation = null;
+ Location currentTextLocation = null;
ConfigHanlder(IDocument document) {
this.document = document;
@@ -165,7 +164,7 @@
int end = getCurrentLocation();
if(end > 0) {
int start = document.get().lastIndexOf("<", end);
- ITextSourceReference endLocation = new Location(start, end - start);
+ Location endLocation = new Location(start, end - start);
//TODO
}
if(currentText.length() > 0) {
13 years, 10 months