JBoss Tools SVN: r31546 - in branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd: jpdl/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-05-27 05:40:53 -0400 (Fri, 27 May 2011)
New Revision: 31546
Modified:
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/Editor.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/GraphicalViewer.java
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlEditor.java
Log:
JBIDE-8979
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/Editor.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/Editor.java 2011-05-27 08:22:20 UTC (rev 31545)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/Editor.java 2011-05-27 09:40:53 UTC (rev 31546)
@@ -78,6 +78,8 @@
private ContentProvider contentProvider;
+ private IPropertySheetPage propertySheetPage;
+
public void init(IEditorSite site, IEditorInput input)
throws PartInitException {
super.init(site, input);
@@ -306,7 +308,7 @@
} else if (adapter == IContentOutlinePage.class) {
return getOutlineViewer();
} else if (adapter == IPropertySheetPage.class) {
- return new TabbedPropertySheetPage(this);
+ return getPropertySheetPage();
} else if (adapter == org.eclipse.gef.GraphicalViewer.class) {
return getGraphicalViewer();
} else {
@@ -314,6 +316,13 @@
}
return result;
}
+
+ public IPropertySheetPage getPropertySheetPage() {
+ if (propertySheetPage == null) {
+ propertySheetPage = new TabbedPropertySheetPage(this);
+ }
+ return propertySheetPage;
+ }
public void doSave(IProgressMonitor monitor) {
if (!checkReadOnly()) return;
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/GraphicalViewer.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/GraphicalViewer.java 2011-05-27 08:22:20 UTC (rev 31545)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/GraphicalViewer.java 2011-05-27 09:40:53 UTC (rev 31546)
@@ -29,8 +29,11 @@
import org.eclipse.gef.ui.actions.ToggleGridAction;
import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.jbpm.gd.jpdl.Constants;
@@ -72,9 +75,15 @@
public FigureCanvas getFigureCanvas() {
return super.getFigureCanvas();
}
-
+
public Editor getEditor() {
return editor;
}
+ protected void fireSelectionChanged() {
+ super.fireSelectionChanged();
+ if (getSelection() != null) {
+ editor.getPropertySheetPage().selectionChanged(editor, getSelection());
+ }
+ }
}
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlEditor.java
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlEditor.java 2011-05-27 08:22:20 UTC (rev 31545)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/editor/JpdlEditor.java 2011-05-27 09:40:53 UTC (rev 31546)
@@ -75,7 +75,7 @@
return new GraphicalViewer(this) {
protected void initEditPartFactory() {
setEditPartFactory(new JpdlGraphicalEditPartFactory());
- }
+ }
};
}
13 years, 1 month
JBoss Tools SVN: r31545 - branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-27 04:22:20 -0400 (Fri, 27 May 2011)
New Revision: 31545
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
Log:
[JBIDE-8860] displaying empty string instead of "null" if instance has no key
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-05-27 08:22:01 UTC (rev 31544)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-05-27 08:22:20 UTC (rev 31545)
@@ -101,25 +101,25 @@
@Override
public Object getPropertyValue(Object id) {
if (id.equals(PROPERTY_NAME)) {
- return instance.getName();
+ return StringUtils.null2EmptyString(instance.getName());
}
if (id.equals(PROPERTY_ALIAS)) {
- return instance.getAlias();
+ return StringUtils.null2EmptyString(instance.getAlias());
}
if (id.equals(PROPERTY_ID)) {
- return instance.getId();
+ return StringUtils.null2EmptyString(instance.getId());
}
if (id.equals(PROPERTY_OWNER)) {
- return instance.getOwnerId();
+ return StringUtils.null2EmptyString(instance.getOwnerId());
}
if (id.equals(PROPERTY_PROFILEID)) {
- return instance.getProfileId();
+ return StringUtils.null2EmptyString(instance.getProfileId());
}
if (id.equals(PROPERTY_REALMID)) {
- return instance.getRealmId();
+ return StringUtils.null2EmptyString(instance.getRealmId());
}
if (id.equals(PROPERTY_IMAGEID)) {
- return instance.getImageId();
+ return StringUtils.null2EmptyString(instance.getImageId());
}
if (id.equals(PROPERTY_KEYNAME)) {
return StringUtils.null2EmptyString(instance.getKeyId());
@@ -130,7 +130,7 @@
if (id.equals(PROPERTY_HOSTNAME)) {
List<String> hostnames = instance.getHostNames();
if (hostnames.size() >= 1) {
- return hostnames.get(0);
+ return StringUtils.null2EmptyString(hostnames.get(0));
}
}
return null;
13 years, 1 month
JBoss Tools SVN: r31544 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-27 04:22:01 -0400 (Fri, 27 May 2011)
New Revision: 31544
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
Log:
displaying empty string instead of "null" if instance property is null
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-05-27 08:20:40 UTC (rev 31543)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-05-27 08:22:01 UTC (rev 31544)
@@ -130,7 +130,7 @@
if (id.equals(PROPERTY_HOSTNAME)) {
List<String> hostnames = instance.getHostNames();
if (hostnames.size() >= 1) {
- return hostnames.get(0);
+ return StringUtils.null2EmptyString(hostnames.get(0));
}
}
return null;
13 years, 1 month
JBoss Tools SVN: r31543 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-27 04:20:40 -0400 (Fri, 27 May 2011)
New Revision: 31543
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
Log:
displaying empty string instead of "null" if instance property is null
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-05-27 08:19:08 UTC (rev 31542)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-05-27 08:20:40 UTC (rev 31543)
@@ -101,25 +101,25 @@
@Override
public Object getPropertyValue(Object id) {
if (id.equals(PROPERTY_NAME)) {
- return instance.getName();
+ return StringUtils.null2EmptyString(instance.getName());
}
if (id.equals(PROPERTY_ALIAS)) {
- return instance.getAlias();
+ return StringUtils.null2EmptyString(instance.getAlias());
}
if (id.equals(PROPERTY_ID)) {
- return instance.getId();
+ return StringUtils.null2EmptyString(instance.getId());
}
if (id.equals(PROPERTY_OWNER)) {
- return instance.getOwnerId();
+ return StringUtils.null2EmptyString(instance.getOwnerId());
}
if (id.equals(PROPERTY_PROFILEID)) {
- return instance.getProfileId();
+ return StringUtils.null2EmptyString(instance.getProfileId());
}
if (id.equals(PROPERTY_REALMID)) {
- return instance.getRealmId();
+ return StringUtils.null2EmptyString(instance.getRealmId());
}
if (id.equals(PROPERTY_IMAGEID)) {
- return instance.getImageId();
+ return StringUtils.null2EmptyString(instance.getImageId());
}
if (id.equals(PROPERTY_KEYNAME)) {
return StringUtils.null2EmptyString(instance.getKeyId());
13 years, 1 month
JBoss Tools SVN: r31542 - branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-27 04:19:08 -0400 (Fri, 27 May 2011)
New Revision: 31542
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
Log:
[JBIDE-8860] displaying empty string instead of "null" if instance has no key
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-05-27 08:18:51 UTC (rev 31541)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-05-27 08:19:08 UTC (rev 31542)
@@ -16,6 +16,7 @@
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.PropertyDescriptor;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+import org.jboss.tools.deltacloud.core.client.utils.StringUtils;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
import org.jboss.tools.deltacloud.ui.views.cloud.InstanceItem;
@@ -121,7 +122,7 @@
return instance.getImageId();
}
if (id.equals(PROPERTY_KEYNAME)) {
- return instance.getKeyId();
+ return StringUtils.null2EmptyString(instance.getKeyId());
}
if (id.equals(PROPERTY_STATE)) {
return instance.getState();
13 years, 1 month
JBoss Tools SVN: r31541 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-27 04:18:51 -0400 (Fri, 27 May 2011)
New Revision: 31541
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
Log:
[JBIDE-8860] displaying empty string instead of "null" if instance has no key
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-05-27 01:14:14 UTC (rev 31540)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/property/InstancePropertySource.java 2011-05-27 08:18:51 UTC (rev 31541)
@@ -15,6 +15,7 @@
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.jboss.tools.deltacloud.client.utils.StringUtils;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
import org.jboss.tools.deltacloud.ui.views.cloud.InstanceItem;
@@ -121,7 +122,7 @@
return instance.getImageId();
}
if (id.equals(PROPERTY_KEYNAME)) {
- return instance.getKeyId();
+ return StringUtils.null2EmptyString(instance.getKeyId());
}
if (id.equals(PROPERTY_STATE)) {
return instance.getState();
13 years, 1 month
JBoss Tools SVN: r31540 - in trunk/jst/tests/org.jboss.tools.jst.web.kb.test: projects and 10 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-26 21:14:14 -0400 (Thu, 26 May 2011)
New Revision: 31540
Added:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.classpath
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.project
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/.jsdtscope
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.jdt.core.prefs
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.common.component
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/demo/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/demo/Messages.properties
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/demo/User.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/.faces-config.xml.jsfdia
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/classes/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/faces-config.xml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/lib/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/lib/jsf-impl.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/web.xml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/pages/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/pages/inputUserName.jsp
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/pages/inputUserName.xhtml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/lib/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/lib/jsf-impl.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelWithSeveralJarCopiesTest.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java
Log:
JBIDE-9005
https://issues.jboss.org/browse/JBIDE-9005
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2011-05-27 00:06:53 UTC (rev 31539)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2011-05-27 01:14:14 UTC (rev 31540)
@@ -11,6 +11,7 @@
org.junit,
org.jboss.tools.tests,
org.jboss.tools.common.el.core,
+ org.jboss.tools.common.model,
org.jboss.tools.common.model.test,
org.jboss.tools.common,
org.eclipse.jst.standard.schemas,
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.classpath (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.classpath 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 4.2 Runtime">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/jsf-impl.jar"/>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.project (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.project 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>TestKbModel4</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/.jsdtscope
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/.jsdtscope (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/.jsdtscope 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.jdt.core.prefs 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,7 @@
+#Thu Jun 04 11:17:46 MSD 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.common.component 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="TestKbModel4">
+<wb-resource deploy-path="/" source-path="/WebContent"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
+<property name="context-root" value="TestKbModel4"/>
+<property name="java-output-path"/>
+</wb-module>
+</project-modules>
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="jst.java"/>
+ <installed facet="jst.java" version="6.0"/>
+ <installed facet="jst.web" version="2.5"/>
+</faceted-project>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/demo/Messages.properties
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/demo/Messages.properties (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/demo/Messages.properties 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,3 @@
+header=Hello Demo Application
+prompt_message=Name:
+hello_message=Hello
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/demo/Messages.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/demo/User.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/demo/User.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/demo/User.java 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and 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
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package demo;
+
+/**
+ * Created by JBoss Developer Studio
+ */
+public class User {
+
+ private String name;
+
+ /**
+ * @return User Name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param User Name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/JavaSource/demo/User.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/.faces-config.xml.jsfdia
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/.faces-config.xml.jsfdia (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/.faces-config.xml.jsfdia 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess">
+ <PROCESS-ITEM NAME="rules:#pages#inputUserName.jsp"
+ PATH="/pages/inputUserName.jsp" SHAPE="32,17,0,0" model-entity="JSFProcessGroup">
+ <PROCESS-ITEM ID="rules:#pages#inputUserName.jsp:0" NAME="item"
+ PATH="/pages/inputUserName.jsp" model-entity="JSFProcessItem">
+ <PROCESS-ITEM-OUTPUT ID="hello::#pages#hello.jsp" NAME="output"
+ PATH="/pages/hello.jsp" TARGET="rules:#pages#hello.jsp"
+ TITLE="hello" model-entity="JSFProcessItemOutput"/>
+ </PROCESS-ITEM>
+ </PROCESS-ITEM>
+ <PROCESS-ITEM NAME="rules:#pages#hello.jsp" PATH="/pages/hello.jsp"
+ SHAPE="240,33,0,0" model-entity="JSFProcessGroup"/>
+</PROCESS>
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/faces-config.xml 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+ <component>
+ <component-type>Component1</component-type>
+ <component-class>com.Component1</component-class>
+ </component>
+ <managed-bean>
+ <description>User Name Bean</description>
+ <managed-bean-name>user</managed-bean-name>
+ <managed-bean-class>demo.User</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ <managed-property>
+ <property-name>name</property-name>
+ <property-class>java.lang.String</property-class>
+ <value/>
+ </managed-property>
+ </managed-bean>
+ <navigation-rule>
+ <from-view-id>/pages/inputUserName.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>hello</from-outcome>
+ <to-view-id>/pages/hello.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+</faces-config>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/lib/jsf-impl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/lib/jsf-impl.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/web.xml 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>TestKbModel</display-name>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+ <listener>
+ <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ </listener>
+ <!-- Faces Servlet -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <!-- Faces Servlet Mapping -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/pages/inputUserName.jsp
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/pages/inputUserName.jsp (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/pages/inputUserName.jsp 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,10 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+
+<f:loadBundle var="Message" basename="demo.Messages"/>
+
+<html>
+ <body>
+ <h1><h:outputText value="#{Message.header}"/></h1>
+ </body>
+</html>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/pages/inputUserName.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/pages/inputUserName.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/pages/inputUserName.xhtml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/pages/inputUserName.xhtml 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,9 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+<h:outputText value=""/>
+
+</html>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/WebContent/pages/inputUserName.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/lib/jsf-impl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel4/lib/jsf-impl.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-05-27 00:06:53 UTC (rev 31539)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-05-27 01:14:14 UTC (rev 31540)
@@ -37,10 +37,11 @@
suite.addTestSuite(KbMockModelTest.class);
suite.addTestSuite(MyFacesKbModelWithMetadataInSourcesTest.class);
suite.addTestSuite(WebKbTest.class);
+ suite.addTestSuite(KbModelWithSeveralJarCopiesTest.class);
testSetup = new XProjectImportTestSetUp(suite,
"org.jboss.tools.jst.web.kb.test",
- new String[]{"projects/TestKbModel", "projects/MyFaces", "projects/MyFaces2", "projects/TestKbModel3"},
- new String[]{"TestKbModel", "MyFaces", "MyFaces2", "TestKbModel3"});
+ new String[]{"projects/TestKbModel", "projects/MyFaces", "projects/MyFaces2", "projects/TestKbModel3", "projects/TestKbModel4"},
+ new String[]{"TestKbModel", "MyFaces", "MyFaces2", "TestKbModel3", "TestKbModel4"});
suiteAll.addTest(testSetup);
suiteAll.addTestSuite(KBValidationTest.class);
return suiteAll;
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelWithSeveralJarCopiesTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelWithSeveralJarCopiesTest.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelWithSeveralJarCopiesTest.java 2011-05-27 01:14:14 UTC (rev 31540)
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and 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
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.web.kb.test;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+import org.jboss.tools.common.model.filesystems.impl.Libs;
+import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.internal.KbObject;
+import org.jboss.tools.jst.web.kb.internal.scanner.LoadedDeclarations;
+import org.jboss.tools.jst.web.kb.internal.scanner.ScannerException;
+import org.jboss.tools.jst.web.kb.internal.scanner.XMLScanner;
+import org.jboss.tools.jst.web.kb.internal.taglib.ELFunction;
+import org.jboss.tools.jst.web.kb.taglib.IELFunction;
+import org.jboss.tools.jst.web.kb.taglib.IFunctionLibrary;
+import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
+import org.jboss.tools.test.util.JUnitUtils;
+
+public class KbModelWithSeveralJarCopiesTest extends TestCase {
+
+ IProject project = null;
+ boolean makeCopy = true;
+
+ public KbModelWithSeveralJarCopiesTest() {
+ super("Kb Model Test");
+ }
+
+ public void setUp() throws Exception {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestKbModel4");
+ assertNotNull("Can't load TestKbModel", project); //$NON-NLS-1$
+ }
+
+ private IKbProject getKbProject() {
+ IKbProject kbProject = null;
+ try {
+ kbProject = (IKbProject)project.getNature(IKbProject.NATURE_ID);
+ } catch (Exception e) {
+ JUnitUtils.fail("Cannot get seam nature.",e);
+ }
+ return kbProject;
+ }
+
+ public void testKbModelWithSeveralJarCopies() {
+ IKbProject kbProject = getKbProject();
+
+ IFile f = project.getFile("WebContent/WEB-INF/inputUserName.xhtml");
+ assertNotNull(f);
+
+ ITagLibrary[] ls = kbProject.getTagLibraries("http://java.sun.com/jsf/html");
+ assertEquals("There should be 2 libraries for http://java.sun.com/jsf/html", 2, ls.length);
+ Set<String> paths = new HashSet<String>();
+
+ for (ITagLibrary l: ls) {
+ String path = l.getSourcePath().toString();
+ paths.add(path);
+ XModelObject o = (XModelObject)((KbObject)l).getId();
+ XModelObject fs = FileSystemsHelper.getLibs(o.getModel()).getLibrary(path);
+ assertNotNull(fs);
+ XModelObject o1 = fs.getChildByPath("META-INF/html_basic.tld");
+ assertTrue(o == o1);
+ }
+ assertEquals("There should be 2 different paths for 2 libraries.", 2, paths.size());
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelWithSeveralJarCopiesTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 1 month
JBoss Tools SVN: r31539 - in trunk/cdi/plugins: org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-05-26 20:06:53 -0400 (Thu, 26 May 2011)
New Revision: 31539
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointListHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/MultipleHyperlinkPresenterManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java
Log:
https://issues.jboss.org/browse/JBIDE-9022
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-05-26 23:42:56 UTC (rev 31538)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-05-27 00:06:53 UTC (rev 31539)
@@ -172,7 +172,7 @@
if(resultBeanList.size() == 1) {
hyperlinks.add(new GenericInjectedPointHyperlink(region, resultBeanList.get(0), document, true));
} else if(resultBeanList.size() > 0) {
- hyperlinks.add(new GenericInjectedPointListHyperlink(region, resultBeanList, viewer, document, hyperlinks.size()));
+ hyperlinks.add(new GenericInjectedPointListHyperlink(region, resultBeanList, viewer, document));
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointListHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointListHyperlink.java 2011-05-26 23:42:56 UTC (rev 31538)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointListHyperlink.java 2011-05-27 00:06:53 UTC (rev 31539)
@@ -24,8 +24,8 @@
AlternativeInjectedPointListHyperlink {
public GenericInjectedPointListHyperlink(IRegion region, List<IBean> beans,
- ITextViewer viewer, IDocument document, int previousIndex) {
- super(region, beans, viewer, document, previousIndex);
+ ITextViewer viewer, IDocument document) {
+ super(region, beans, viewer, document);
}
@Override
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java 2011-05-26 23:42:56 UTC (rev 31538)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AlternativeInjectedPointListHyperlink.java 2011-05-27 00:06:53 UTC (rev 31539)
@@ -23,13 +23,11 @@
private IRegion region;
private List<IBean> beans;
private ITextViewer viewer;
- private int previousIndex;
- public AlternativeInjectedPointListHyperlink(IRegion region, List<IBean> beans, ITextViewer viewer, IDocument document, int previousIndex){
+ public AlternativeInjectedPointListHyperlink(IRegion region, List<IBean> beans, ITextViewer viewer, IDocument document){
this.beans = beans;
this.region = region;
this.viewer = viewer;
- this.previousIndex = previousIndex;
setDocument(document);
}
@@ -55,7 +53,7 @@
if(hyperlinks.length == 1){
((InjectedPointHyperlink)hyperlinks[0]).doHyperlink(region);
}else{
- MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks, previousIndex);
+ MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-05-26 23:42:56 UTC (rev 31538)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-05-27 00:06:53 UTC (rev 31539)
@@ -113,7 +113,7 @@
Set<IObserverMethod> observerMethods = cdiProject.resolveObserverMethods(injectionPoint);
if(observerMethods.size() > 0)
- hyperlinks.add(new ObserverMethodListHyperlink(textViewer, region, observerMethods, document, hyperlinks.size()));
+ hyperlinks.add(new ObserverMethodListHyperlink(textViewer, region, observerMethods, document));
} else if(param != null) {
Set<IInjectionPoint> events = new HashSet<IInjectionPoint>();
@@ -121,7 +121,7 @@
events.addAll(cdiProject.findObservedEvents(p));
if(events.size() > 0)
- hyperlinks.add(new EventListHyperlink(textViewer, region, events, document, hyperlinks.size()));
+ hyperlinks.add(new EventListHyperlink(textViewer, region, events, document));
}
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java 2011-05-26 23:42:56 UTC (rev 31538)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventListHyperlink.java 2011-05-27 00:06:53 UTC (rev 31539)
@@ -24,13 +24,11 @@
private ITextViewer viewer;
private Set<IInjectionPoint> events;
private IRegion region;
- private int previousIndex;
- public EventListHyperlink(ITextViewer viewer, IRegion region, Set<IInjectionPoint> events, IDocument document, int previousIndex){
+ public EventListHyperlink(ITextViewer viewer, IRegion region, Set<IInjectionPoint> events, IDocument document){
this.viewer = viewer;
this.events = events;
this.region = region;
- this.previousIndex = previousIndex;
setDocument(document);
}
@@ -55,7 +53,7 @@
if(hyperlinks.length == 1){
((EventHyperlink)hyperlinks[0]).doHyperlink(region);
}else{
- MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks, previousIndex);
+ MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-05-26 23:42:56 UTC (rev 31538)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-05-27 00:06:53 UTC (rev 31539)
@@ -139,7 +139,7 @@
if(resultBeanList.size() > 0){
hyperlinks.add(new InjectedPointHyperlink(region, resultBeanList.get(0), document, true));
if(alternativeBeanList.size() > 1)
- hyperlinks.add(new AlternativeInjectedPointListHyperlink(region, alternativeBeanList, viewer, document, hyperlinks.size()));
+ hyperlinks.add(new AlternativeInjectedPointListHyperlink(region, alternativeBeanList, viewer, document));
}
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/MultipleHyperlinkPresenterManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/MultipleHyperlinkPresenterManager.java 2011-05-26 23:42:56 UTC (rev 31538)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/MultipleHyperlinkPresenterManager.java 2011-05-27 00:06:53 UTC (rev 31539)
@@ -23,12 +23,12 @@
private static boolean installed = false;
private static MyPartListener listener = new MyPartListener();
- public static void installAndShow(ITextViewer viewer, IHyperlink[] hyperlinks, int previousIndex){
+ public static void installAndShow(ITextViewer viewer, IHyperlink[] hyperlinks){
if(installed)
uninstall();
mhp.install(viewer);
- mhp.showHyperlinks(hyperlinks, previousIndex);
+ mhp.showHyperlinks(hyperlinks);
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().addPartListener(listener);
installed = true;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java 2011-05-26 23:42:56 UTC (rev 31538)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodListHyperlink.java 2011-05-27 00:06:53 UTC (rev 31539)
@@ -24,13 +24,11 @@
private ITextViewer viewer;
private Set<IObserverMethod> observerMethods;
private IRegion region;
- private int previousIndex;
- public ObserverMethodListHyperlink(ITextViewer viewer, IRegion region, Set<IObserverMethod> observerMethods, IDocument document, int previousIndex){
+ public ObserverMethodListHyperlink(ITextViewer viewer, IRegion region, Set<IObserverMethod> observerMethods, IDocument document){
this.viewer = viewer;
this.observerMethods = observerMethods;
this.region = region;
- this.previousIndex = previousIndex;
setDocument(document);
}
@@ -55,7 +53,7 @@
if(hyperlinks.length == 1){
((ObserverMethodHyperlink)hyperlinks[0]).doHyperlink(region);
}else{
- MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks, previousIndex);
+ MultipleHyperlinkPresenterManager.installAndShow(viewer, hyperlinks);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java 2011-05-26 23:42:56 UTC (rev 31538)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java 2011-05-27 00:06:53 UTC (rev 31539)
@@ -595,10 +595,10 @@
* @see org.eclipse.jface.text.AbstractInformationControlManager#showInformationControl(org.eclipse.swt.graphics.Rectangle)
*/
protected void showInformationControl(Rectangle subjectArea) {
- int offset = fTextViewer.getTextWidget().getLineHeight()*(index+1);
- Rectangle bounds = ((IInformationControlExtension3)fInformationControl).getBounds();
- Point location = new Point(bounds.x, bounds.y+offset);
+ Point point = Display.getCurrent().getCursorLocation();
+ Point location = new Point(point.x-20, point.y-20);
fInformationControl.setLocation(location);
+
if (fTextViewer instanceof IWidgetTokenOwnerExtension) {
if (((IWidgetTokenOwnerExtension) fTextViewer).requestWidgetToken(this, WIDGET_TOKEN_PRIORITY))
super.showInformationControl(subjectArea);
@@ -764,16 +764,12 @@
fHyperlinks= null;
}
- private static int index=0;
-
/*
* @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#showHyperlinks(org.eclipse.jface.text.hyperlink.IHyperlink[])
*/
- public void showHyperlinks(IHyperlink[] hyperlinks, int index) {
+ public void showHyperlinks(IHyperlink[] hyperlinks) {
super.showHyperlinks(new IHyperlink[] { hyperlinks[0] });
- this.index = index;
-
fSubjectRegion= null;
fHyperlinks= hyperlinks;
13 years, 1 month
JBoss Tools SVN: r31538 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-26 19:42:56 -0400 (Thu, 26 May 2011)
New Revision: 31538
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java
Log:
JBIDE-9005
https://issues.jboss.org/browse/JBIDE-9005
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java 2011-05-26 23:14:47 UTC (rev 31537)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/ModelObjectStorageEditorInput.java 2011-05-26 23:42:56 UTC (rev 31538)
@@ -11,8 +11,6 @@
package org.jboss.tools.common.model.ui.editor;
import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
@@ -30,6 +28,7 @@
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.filesystems.impl.*;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.FileUtil;
@@ -79,21 +78,34 @@
if(!(o instanceof JarSystemImpl)) return null;
String file = ((JarSystemImpl)o).getLocation();
-// IFile[] fs = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(new File(file).toURI());
-// if(fs == null || fs.length == 0) return null;
-
IProject p = EclipseResourceUtil.getProject(o);
IJavaProject jp = EclipseResourceUtil.getJavaProject(p);
if(jp == null) return null;
+
+ IPackageFragmentRoot root = null;
+
+ try {
+ IPackageFragmentRoot[] rs = jp.getAllPackageFragmentRoots();
+ for (IPackageFragmentRoot r: rs) {
+ if(r.getResource() != null && r.getResource().exists()
+ && r.getResource().getLocation().toString().equals(file)) {
+ root = r;
+ } else if(r.getPath() != null && r.getPath().toString().equals(file)) {
+ root = r;
+ }
+ }
+ } catch (CoreException e) {
+ ModelUIPlugin.getDefault().logError(e);
+ }
- IPackageFragmentRoot root = jp.getPackageFragmentRoot(file);
- if(root == null) return null;
+ if(root == null) {
+ root = jp.getPackageFragmentRoot(file);
+ }
+
+ if(root == null) {
+ return null;
+ }
- try {
- file = new File(file).getCanonicalPath();
- } catch (IOException e) {
-
- }
if(current != null && !"META-INF".equalsIgnoreCase(current.getName()) && packageName.length() > 0) {
IPackageFragment pf = root.getPackageFragment(packageName);
f.setParent(pf);
13 years, 1 month
JBoss Tools SVN: r31537 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-05-26 19:14:47 -0400 (Thu, 26 May 2011)
New Revision: 31537
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateResourceTree.java
Log:
JBIDE-9005
https://issues.jboss.org/browse/JBIDE-9005
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateResourceTree.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateResourceTree.java 2011-05-26 23:14:16 UTC (rev 31536)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibernateResourceTree.java 2011-05-26 23:14:47 UTC (rev 31537)
@@ -9,6 +9,7 @@
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.filesystems.XFileObject;
import org.jboss.tools.common.model.filesystems.impl.FileSystemsImpl;
+import org.jboss.tools.common.model.filesystems.impl.Libs;
import org.jboss.tools.common.model.impl.trees.FileSystemResourceTree;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -45,7 +46,7 @@
}
for (int i = 0; i < os.length; i++) {
String name = os[i].getAttributeValue(XModelObjectConstants.ATTR_NAME);
- if(name.startsWith("lib-")) { //$NON-NLS-1$
+ if(name.startsWith(Libs.LIB_PREFIX)) {
list.add(os[i]);
}
}
13 years, 1 month