JBoss Tools SVN: r15527 - 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: akazakov
Date: 2009-05-26 19:31:10 -0400 (Tue, 26 May 2009)
New Revision: 15527
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IPageContext.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IPageContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IPageContext.java 2009-05-26 22:26:25 UTC (rev 15526)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IPageContext.java 2009-05-26 23:31:10 UTC (rev 15527)
@@ -51,6 +51,7 @@
/**
* Returns map of name spaces which are set in particular offset.
+ * Key is URI of name space.
* @return
*/
Map<String, INameSpace> getNameSpaces(int offset);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-05-26 22:26:25 UTC (rev 15526)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/JspContextImpl.java 2009-05-26 23:31:10 UTC (rev 15527)
@@ -99,6 +99,6 @@
Map<String, INameSpace> nameSpaceMap = new HashMap<String, INameSpace>();
nameSpaces.put(region, nameSpaceMap);
}
- nameSpaces.get(region).put(nameSpace.getPrefix(), nameSpace);
+ nameSpaces.get(region).put(nameSpace.getURI(), nameSpace);
}
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2009-05-26 22:26:25 UTC (rev 15526)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2009-05-26 23:31:10 UTC (rev 15527)
@@ -27,7 +27,6 @@
import org.jboss.tools.jst.web.kb.internal.KbXMLStoreConstants;
import org.jboss.tools.jst.web.kb.taglib.IAttribute;
import org.jboss.tools.jst.web.kb.taglib.IComponent;
-import org.jboss.tools.jst.web.kb.taglib.INameSpace;
import org.w3c.dom.Element;
/**
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-05-26 22:26:25 UTC (rev 15526)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-05-26 23:31:10 UTC (rev 15527)
@@ -178,6 +178,14 @@
* @see org.jboss.tools.jst.web.kb.ProposalProcessor#getProposals(org.jboss.tools.jst.web.kb.KbQuery, org.jboss.tools.jst.web.kb.PageContext)
*/
public TextProposal[] getProposals(KbQuery query, IPageContext context) {
+ String prefix = null;
+ Map<String, INameSpace> nameSpaces = context.getNameSpaces(query.getOffset());
+ if(nameSpaces!=null) {
+ INameSpace nameSpace = nameSpaces.get(getURI());
+ if(nameSpace!=null) {
+ prefix = nameSpace.getPrefix();
+ }
+ }
List<TextProposal> proposals = new ArrayList<TextProposal>();
IComponent[] components = getComponents(query, context);
if(query.getType() == KbQuery.Type.TAG_NAME) {
@@ -185,7 +193,7 @@
TextProposal proposal = new TextProposal();
proposal.setContextInfo(components[i].getDescription());
StringBuffer label = new StringBuffer();
- if(query.getPrefix()!=null) {
+ if(prefix!=null) {
label.append(query.getPrefix() + KbQuery.PREFIX_SEPARATOR);
}
label.append(components[i].getName());
14 years, 11 months
JBoss Tools SVN: r15526 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-05-26 18:26:25 -0400 (Tue, 26 May 2009)
New Revision: 15526
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
Log:
JBIDE-2808: Improve/refactor org.jboss.tools.common.kb plugin.
getProposals() method is fixed: NullPointerException.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-05-26 22:23:27 UTC (rev 15525)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-05-26 22:26:25 UTC (rev 15526)
@@ -42,7 +42,7 @@
public TextProposal[] getProposals(KbQuery query, IPageContext context) {
ArrayList<TextProposal> proposals = new ArrayList<TextProposal>();
ITagLibrary[] libs = context.getLibraries();
- for (int i = 0; i < libs.length; i++) {
+ for (int i = 0; libs != null && i < libs.length; i++) {
TextProposal[] libProposals = libs[i].getProposals(query, context);
for (int j = 0; j < libProposals.length; j++) {
proposals.add(libProposals[i]);
@@ -53,7 +53,7 @@
//TODO convert value to EL string.
String elString = value;
ELResolver[] resolvers = context.getElResolvers();
- for (int i = 0; i < resolvers.length; i++) {
+ for (int i = 0; resolvers != null && i < resolvers.length; i++) {
proposals.addAll(resolvers[i].getCompletions(elString, !query.isMask(), query.getOffset(), context));
}
}
14 years, 11 months
JBoss Tools SVN: r15525 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: taglib and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-05-26 18:23:27 -0400 (Tue, 26 May 2009)
New Revision: 15525
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibriryManager.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-05-26 22:20:57 UTC (rev 15524)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-05-26 22:23:27 UTC (rev 15525)
@@ -25,6 +25,9 @@
private static final PageProcessor INSTANCE = new PageProcessor();
+ /**
+ * @return instance of PageProcessor
+ */
public static PageProcessor getInstance() {
return INSTANCE;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibriryManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibriryManager.java 2009-05-26 22:20:57 UTC (rev 15524)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/TagLibriryManager.java 2009-05-26 22:23:27 UTC (rev 15525)
@@ -13,6 +13,7 @@
import org.eclipse.core.resources.IProject;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
+import org.jboss.tools.jst.web.kb.WebKbPlugin;
/**
* @author Alexey Kazakov
@@ -27,6 +28,10 @@
*/
public static ITagLibrary[] getLibraries(IProject project, String uri) {
IKbProject kbProject = KbProjectFactory.getKbProject(project, true);
+ if(kbProject==null) {
+ WebKbPlugin.getDefault().logWarning("Project " + project.getName() + " doesn't have KB nature.");
+ return new ITagLibrary[0];
+ }
return kbProject.getTagLibraries(uri);
}
}
\ No newline at end of file
14 years, 11 months
JBoss Tools SVN: r15524 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: src/org/jboss/tools/flow/jpdl4/editor and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-05-26 18:20:57 -0400 (Tue, 26 May 2009)
New Revision: 15524
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListenerListTreeEditPart.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/EventListenerListTreeEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowTreeRootEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TaskTreeRootEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java
Log:
- Event listeners on nodes and transitions (GPD-332)
- Deserialization of decision handler (GPD-342)
- Adding second swimlane and timer (GPD-343)
- On elements are no longer removed from nodes (GPD-340)
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-05-26 22:20:57 UTC (rev 15524)
@@ -489,6 +489,12 @@
value="org.jboss.tools.flow.jpdl4.editpart.ProcessTreeRootEditPart">
</instanceof>
<instanceof
+ value="org.jboss.tools.flow.jpdl4.editpart.TaskTreeRootEditPart">
+ </instanceof>
+ <instanceof
+ value="org.jboss.tools.flow.jpdl4.editpart.SequenceFlowTreeRootEditPart">
+ </instanceof>
+ <instanceof
value="org.jboss.tools.flow.jpdl4.editpart.EventListenerListTreeEditPart">
</instanceof>
</or>
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -221,7 +221,7 @@
}
}
- class ConnectionAttributeHandler extends DefaultAttributeDeserializer {
+ class SequenceFlowAttributeHandler extends DefaultAttributeDeserializer {
public void deserializeAttributes(Wrapper wrapper, Element element) {
super.deserializeAttributes(wrapper, element);
if (!(wrapper instanceof ConnectionWrapper)) return;
@@ -232,6 +232,24 @@
}
}
+ class SequenceFlowChildNodeHandler implements ChildNodeDeserializer {
+ public Wrapper deserializeChildNode(Wrapper parent, Node node) {
+ Wrapper result = null;
+ if (!(parent instanceof ConnectionWrapper)) return result;
+ ConnectionWrapper connectionWrapper = (ConnectionWrapper)parent;
+ if (node instanceof Element) {
+ result = createWrapper((Element)node);
+ if (result == null) return null;
+ if (result instanceof Wrapper) {
+ if (result.getElement() instanceof EventListener) {
+ connectionWrapper.addChild("listener", result);
+ }
+ }
+ }
+ return result;
+ }
+ }
+
class ProcessChildNodeHandler implements ChildNodeDeserializer {
public Wrapper deserializeChildNode(Wrapper parent, Node node) {
Wrapper result = null;
@@ -281,8 +299,12 @@
}
if (node instanceof Element) {
result = createWrapper((Element)node);
- if (result != null && result instanceof ConnectionWrapper) {
- flows.add((ConnectionWrapper)result);
+ if (result != null) {
+ if (result instanceof ConnectionWrapper) {
+ flows.add((ConnectionWrapper)result);
+ } else if (result.getElement() instanceof EventListenerContainer) {
+ parent.addChild("eventListener", result);
+ }
}
}
return result;
@@ -291,11 +313,13 @@
class ExclusiveGateWayChildNodeHandler extends NodeChildNodeHandler {
public Wrapper deserializeChildNode(Wrapper parent, Node node) {
- Wrapper result = super.deserializeChildNode(parent, node);
+ Wrapper result = null;
ExclusiveGateway exclusiveGateway = (ExclusiveGateway)parent.getElement();
if (node instanceof Element && "handler".equals(node.getNodeName())) {
String className = ((Element)node).getAttribute("class");
exclusiveGateway.setHandler("".equals(className) ? null : className);
+ } else {
+ result = super.deserializeChildNode(parent, node);
}
return result;
}
@@ -383,7 +407,7 @@
} else if (wrapper instanceof NodeWrapper) {
return getNodeAttributeHandler(wrapper);
} else if (wrapper instanceof ConnectionWrapper) {
- return new ConnectionAttributeHandler();
+ return new SequenceFlowAttributeHandler();
} else if (wrapper instanceof DefaultWrapper) {
return getDefaultAttributeHandler(wrapper);
}
@@ -424,6 +448,8 @@
return getNodeChildNodeDeserializer(wrapper);
} else if (wrapper instanceof DefaultWrapper) {
return getDefaultChildNodeHandler(wrapper);
+ } else if (wrapper instanceof ConnectionWrapper) {
+ return new SequenceFlowChildNodeHandler();
}
return null;
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -265,6 +265,15 @@
buffer.append(labelBuffer);
buffer.append("\"");
}
+ public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) {
+ List<Element> eventListeners = wrapper.getChildren("listener");
+ if (eventListeners != null) {
+ for (Element eventListener : eventListeners) {
+ if (!(eventListener instanceof Wrapper)) continue;
+ appendToBuffer(buffer, (Wrapper)eventListener, level+1);
+ }
+ }
+ }
}
class ProcessNodeWrapperSerializer extends AbstractWrapperSerializer {
@@ -305,6 +314,13 @@
}
public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) {
NodeWrapper nodeWrapper = (NodeWrapper)wrapper;
+ List<Element> eventListenerContainers = nodeWrapper.getChildren("eventListener");
+ if (eventListenerContainers != null) {
+ for (Element eventListenerContainer : eventListenerContainers) {
+ if (!(eventListenerContainer instanceof Wrapper)) continue;
+ appendToBuffer(buffer, (Wrapper)eventListenerContainer, level+1);
+ }
+ }
List<ConnectionWrapper> children = nodeWrapper.getOutgoingConnections();
for (ConnectionWrapper connectionWrapper : children) {
appendToBuffer(buffer, connectionWrapper, level+1);
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/EventListenerListTreeEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/EventListenerListTreeEditPart.java 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/EventListenerListTreeEditPart.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -59,7 +59,15 @@
((JpdlTreeEditPart)parent).modelChanged(modelEvent);
}
refreshChildren();
- } else if (event.getChangeType() == Wrapper.CHANGE_PROPERTY) {
+ } else if (event.getChangeType() == Wrapper.ADD_ELEMENT) {
+ refreshChildren();
+ Object object = event.getNewValue();
+ EditPart editPart = (EditPart)getViewer().getEditPartRegistry().get(object);
+ if (editPart != null) {
+ getViewer().select(editPart);
+ }
+ }
+ else if (event.getChangeType() == Wrapper.CHANGE_PROPERTY) {
refreshVisuals();
}
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -28,6 +28,7 @@
}
if (model instanceof SwimlaneListTreeEditPart) return (EditPart)model;
if (model instanceof TimerListTreeEditPart) return (EditPart)model;
+ if (model instanceof ListenerListTreeEditPart) return (EditPart)model;
return new NoDetailsTreeRootEditPart();
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListenerListTreeEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListenerListTreeEditPart.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListenerListTreeEditPart.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -0,0 +1,33 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.flow.common.model.Element;
+import org.jboss.tools.flow.jpdl4.util.SharedImages;
+
+public class ListenerListTreeEditPart extends JpdlTreeEditPart {
+
+ public ListenerListTreeEditPart(List<Element> timers) {
+ super(timers);
+ }
+
+ protected Image getImage() {
+ String iconPath = "icons/16/events_multiple.gif";
+ ImageDescriptor descriptor = ImageDescriptor.createFromURL(
+ Platform.getBundle("org.jboss.tools.flow.jpdl4").getEntry(iconPath));
+ return SharedImages.INSTANCE.getImage(descriptor);
+ }
+
+ protected String getText() {
+ return "Event Listeners";
+ }
+
+ @SuppressWarnings("unchecked")
+ protected List<Object> getModelChildren() {
+ return (List<Object>)getModel();
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ListenerListTreeEditPart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -5,14 +5,13 @@
import org.eclipse.gef.EditPart;
import org.jboss.tools.flow.common.model.Element;
-import org.jboss.tools.flow.common.wrapper.FlowWrapper;
import org.jboss.tools.flow.common.wrapper.ModelEvent;
import org.jboss.tools.flow.common.wrapper.Wrapper;
public class ProcessTreeRootEditPart extends JpdlTreeEditPart {
- public ProcessTreeRootEditPart(FlowWrapper flowWrapper) {
- super(flowWrapper);
+ public ProcessTreeRootEditPart(Wrapper wrapper) {
+ super(wrapper);
}
protected void createEditPolicies() {
@@ -20,23 +19,23 @@
protected List<Object> getModelChildren() {
List<Object> result = new ArrayList<Object>();
- FlowWrapper flowWrapper = (FlowWrapper)getModel();
- if (flowWrapper == null) return null;
- addSwimlanes(result, flowWrapper);
- addEventListeners(result, flowWrapper);
- addTimers(result, flowWrapper);
+ Wrapper wrapper = (Wrapper)getModel();
+ if (wrapper == null) return null;
+ addSwimlanes(result, wrapper);
+ addEventListeners(result, wrapper);
+ addTimers(result, wrapper);
return result;
}
- private void addSwimlanes(List<Object> list, FlowWrapper flowWrapper) {
- List<Element> swimlanes = flowWrapper.getChildren("swimlane");
+ private void addSwimlanes(List<Object> list, Wrapper wrapper) {
+ List<Element> swimlanes = wrapper.getChildren("swimlane");
if (swimlanes != null && !swimlanes.isEmpty()) {
list.add(new SwimlaneListTreeEditPart(swimlanes));
}
}
- private void addEventListeners(List<Object> list, FlowWrapper flowWrapper) {
- List<Element> eventListeners = flowWrapper.getChildren("eventListener");
+ private void addEventListeners(List<Object> list, Wrapper wrapper) {
+ List<Element> eventListeners = wrapper.getChildren("eventListener");
if (eventListeners == null) return;
for (Element element : eventListeners) {
if (element instanceof Wrapper) {
@@ -45,8 +44,8 @@
}
}
- private void addTimers(List<Object> list, FlowWrapper flowWrapper) {
- List<Element> timers = flowWrapper.getChildren("timer");
+ private void addTimers(List<Object> list, Wrapper wrapper) {
+ List<Element> timers = wrapper.getChildren("timer");
if (timers != null && !timers.isEmpty()) {
list.add(new TimerListTreeEditPart(timers));
}
@@ -67,11 +66,11 @@
public void activate() {
super.activate();
- ((FlowWrapper)getModel()).addListener(this);
+ ((Wrapper)getModel()).addListener(this);
}
public void deactivate() {
- ((FlowWrapper)getModel()).removeListener(this);
+ ((Wrapper)getModel()).removeListener(this);
super.deactivate();
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowTreeRootEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowTreeRootEditPart.java 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowTreeRootEditPart.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -3,18 +3,53 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
+import org.eclipse.gef.EditPart;
+import org.jboss.tools.flow.common.model.Element;
+import org.jboss.tools.flow.common.wrapper.ModelEvent;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
public class SequenceFlowTreeRootEditPart extends JpdlTreeEditPart {
- public SequenceFlowTreeRootEditPart(ConnectionWrapper connectionWrapper) {
- super(connectionWrapper);
+ public SequenceFlowTreeRootEditPart(Wrapper wrapper) {
+ super(wrapper);
}
protected List<Object> getModelChildren() {
List<Object> result = new ArrayList<Object>();
- result.add(new EventListenerListTreeEditPart(null));
+ Wrapper wrapper = (Wrapper)getModel();
+ if (wrapper == null) return null;
+ addEventListeners(result, wrapper);
return result;
}
+ private void addEventListeners(List<Object> list, Wrapper wrapper) {
+ List<Element> eventListeners = wrapper.getChildren("listener");
+ if (eventListeners != null && !eventListeners.isEmpty()) {
+ list.add(new ListenerListTreeEditPart(eventListeners));
+ }
+ }
+
+ public void modelChanged(ModelEvent event) {
+ if (event.getChangeType() == Wrapper.ADD_ELEMENT) {
+ refreshChildren();
+ Object object = event.getNewValue();
+ EditPart editPart = (EditPart)getViewer().getEditPartRegistry().get(object);
+ if (editPart != null) {
+ getViewer().select(editPart);
+ }
+ } else if (event.getChangeType() == Wrapper.REMOVE_ELEMENT) {
+ refreshChildren();
+ }
+ }
+
+ public void activate() {
+ super.activate();
+ ((Wrapper)getModel()).addListener(this);
+ }
+
+ public void deactivate() {
+ ((Wrapper)getModel()).removeListener(this);
+ super.deactivate();
+ }
+
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TaskTreeRootEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TaskTreeRootEditPart.java 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/TaskTreeRootEditPart.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -3,18 +3,56 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.tools.flow.common.wrapper.NodeWrapper;
+import org.eclipse.gef.EditPart;
+import org.jboss.tools.flow.common.model.Element;
+import org.jboss.tools.flow.common.wrapper.ModelEvent;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
public class TaskTreeRootEditPart extends JpdlTreeEditPart {
- public TaskTreeRootEditPart(NodeWrapper nodeWrapper) {
- super(nodeWrapper);
+ public TaskTreeRootEditPart(Wrapper wrapper) {
+ super(wrapper);
}
protected List<Object> getModelChildren() {
List<Object> result = new ArrayList<Object>();
- result.add(new EventListenerListTreeEditPart(null));
+ Wrapper wrapper = (Wrapper)getModel();
+ if (wrapper == null) return null;
+ addEventListeners(result, wrapper);
return result;
}
+ private void addEventListeners(List<Object> list, Wrapper wrapper) {
+ List<Element> eventListeners = wrapper.getChildren("eventListener");
+ if (eventListeners == null) return;
+ for (Element element : eventListeners) {
+ if (element instanceof Wrapper) {
+ list.add((Wrapper)element);
+ }
+ }
+ }
+
+ public void modelChanged(ModelEvent event) {
+ if (event.getChangeType() == Wrapper.ADD_ELEMENT) {
+ refreshChildren();
+ Object object = event.getNewValue();
+ EditPart editPart = (EditPart)getViewer().getEditPartRegistry().get(object);
+ if (editPart != null) {
+ getViewer().select(editPart);
+ }
+ } else if (event.getChangeType() == Wrapper.REMOVE_ELEMENT) {
+ refreshChildren();
+ }
+ }
+
+ public void activate() {
+ super.activate();
+ ((Wrapper)getModel()).addListener(this);
+ }
+
+ public void deactivate() {
+ ((Wrapper)getModel()).removeListener(this);
+ super.deactivate();
+ }
+
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddEventListenerHandler.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -15,7 +15,9 @@
import org.jboss.tools.flow.common.command.AddChildCommand;
import org.jboss.tools.flow.common.registry.ElementRegistry;
import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.editpart.SequenceFlowTreeRootEditPart;
import org.jboss.tools.flow.jpdl4.model.EventListenerContainer;
+import org.jboss.tools.flow.jpdl4.model.SequenceFlow;
public class AddEventListenerHandler extends AbstractHandler implements IHandler {
@@ -38,14 +40,20 @@
Wrapper parent = (Wrapper)model;
Wrapper child;
AddChildCommand addChildCommand = new AddChildCommand();
- if (editPart.getParent() != null && editPart.getParent() instanceof RootEditPart) {
+ if (editPart.getParent() != null
+ && editPart.getParent() instanceof RootEditPart
+ && !(editPart instanceof SequenceFlowTreeRootEditPart)) {
child = ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.eventListenerContainer");
Wrapper wrapper = ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.eventListener");
addChildCommand.setType("eventListener");
child.addChild(EventListenerContainer.LISTENERS, wrapper);
} else {
child = ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.eventListener");
- addChildCommand.setType(EventListenerContainer.LISTENERS);
+ if (parent.getElement() instanceof SequenceFlow) {
+ addChildCommand.setType("listener");
+ } else {
+ addChildCommand.setType(EventListenerContainer.LISTENERS);
+ }
}
addChildCommand.setChild(child);
addChildCommand.setParent(parent);
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddSwimlaneHandler.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -16,8 +16,8 @@
import org.jboss.tools.flow.common.wrapper.Wrapper;
public class AddSwimlaneHandler extends AbstractHandler implements IHandler {
-
- public Object execute(ExecutionEvent event) throws ExecutionException {
+
+ private Wrapper getParent(ExecutionEvent event) throws ExecutionException {
IWorkbenchPage page = HandlerUtil.getActiveWorkbenchWindowChecked(event).getActivePage();
if (page == null) return null;
ISelection selection = page.getSelection();
@@ -26,9 +26,18 @@
Object first = structuredSelection.getFirstElement();
if (!(first instanceof EditPart)) return null;
EditPart editPart = (EditPart)first;
- Object model = editPart.getModel();
- if (model == null || !(model instanceof Wrapper)) return null;
- Wrapper parent = (Wrapper)model;
+ while (editPart != null) {
+ Object model = editPart.getModel();
+ if (model != null && model instanceof Wrapper) {
+ return (Wrapper)model;
+ }
+ editPart = editPart.getParent();
+ }
+ return null;
+ }
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ Wrapper parent = getParent(event);
IEditorPart editorPart = HandlerUtil.getActiveEditor(event);
if (editorPart == null) return null;
Object object = editorPart.getAdapter(CommandStack.class);
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/AddTimerHandler.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -13,12 +13,11 @@
import org.eclipse.ui.handlers.HandlerUtil;
import org.jboss.tools.flow.common.command.AddChildCommand;
import org.jboss.tools.flow.common.registry.ElementRegistry;
-import org.jboss.tools.flow.common.wrapper.FlowWrapper;
import org.jboss.tools.flow.common.wrapper.Wrapper;
public class AddTimerHandler extends AbstractHandler implements IHandler {
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ private Wrapper getParent(ExecutionEvent event) throws ExecutionException {
IWorkbenchPage page = HandlerUtil.getActiveWorkbenchWindowChecked(event).getActivePage();
if (page == null) return null;
ISelection selection = page.getSelection();
@@ -27,9 +26,18 @@
Object first = structuredSelection.getFirstElement();
if (!(first instanceof EditPart)) return null;
EditPart editPart = (EditPart)first;
- Object model = editPart.getModel();
- if (model == null || !(model instanceof FlowWrapper)) return null;
- FlowWrapper flowWrapper = (FlowWrapper)model;
+ while (editPart != null) {
+ Object model = editPart.getModel();
+ if (model != null && model instanceof Wrapper) {
+ return (Wrapper)model;
+ }
+ editPart = editPart.getParent();
+ }
+ return null;
+ }
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ Wrapper parent = getParent(event);
IEditorPart editorPart = HandlerUtil.getActiveEditor(event);
if (editorPart == null) return null;
Object object = editorPart.getAdapter(CommandStack.class);
@@ -39,7 +47,7 @@
Wrapper child = ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.timer");
addChildCommand.setChild(child);
addChildCommand.setType("timer");
- addChildCommand.setParent(flowWrapper);
+ addChildCommand.setParent(parent);
commandStack.execute(addChildCommand);
return null;
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java 2009-05-26 20:53:13 UTC (rev 15523)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/handler/DeleteElementHandler.java 2009-05-26 22:20:57 UTC (rev 15524)
@@ -16,8 +16,10 @@
import org.jboss.tools.flow.common.model.Element;
import org.jboss.tools.flow.common.wrapper.Wrapper;
import org.jboss.tools.flow.jpdl4.Logger;
+import org.jboss.tools.flow.jpdl4.editpart.EventListenerListTreeEditPart;
import org.jboss.tools.flow.jpdl4.model.EventListener;
import org.jboss.tools.flow.jpdl4.model.EventListenerContainer;
+import org.jboss.tools.flow.jpdl4.model.SequenceFlow;
import org.jboss.tools.flow.jpdl4.model.Swimlane;
import org.jboss.tools.flow.jpdl4.model.Timer;
@@ -52,7 +54,11 @@
} else if (child.getElement() instanceof Timer) {
deleteChildCommand.setType("timer");
} else if (child.getElement() instanceof EventListener) {
- deleteChildCommand.setType(EventListenerContainer.LISTENERS);
+ if (parent.getElement() instanceof SequenceFlow) {
+ deleteChildCommand.setType("listener");
+ } else {
+ deleteChildCommand.setType(EventListenerContainer.LISTENERS);
+ }
} else if (child.getElement() instanceof EventListenerContainer) {
deleteChildCommand.setType("eventListener");
}
@@ -66,10 +72,10 @@
}
private EditPart getParentEditPart(Element element, EditPart editPart) {
- if (element instanceof Swimlane || element instanceof Timer) {
+ if (editPart.getParent() instanceof EventListenerListTreeEditPart) {
+ return editPart.getParent();
+ } else {
return getRootEditPart(editPart);
- } else {
- return editPart.getParent();
}
}
14 years, 11 months
JBoss Tools SVN: r15523 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-05-26 16:53:13 -0400 (Tue, 26 May 2009)
New Revision: 15523
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-05-26 20:48:54 UTC (rev 15522)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-05-26 20:53:13 UTC (rev 15523)
@@ -23,6 +23,15 @@
*/
public class PageProcessor implements IProposalProcessor {
+ private static final PageProcessor INSTANCE = new PageProcessor();
+
+ public static PageProcessor getInstance() {
+ return INSTANCE;
+ }
+
+ private PageProcessor() {
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.ProposalProcessor#getProposals(org.jboss.tools.jst.web.kb.KbQuery, org.jboss.tools.jst.web.kb.PageContext)
14 years, 11 months
JBoss Tools SVN: r15522 - in trunk/seam/tests/org.jboss.tools.seam.core.test: src/org/jboss/tools/seam/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-05-26 16:48:54 -0400 (Tue, 26 May 2009)
New Revision: 15522
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.project
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4378 Fixed
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.project 2009-05-26 20:44:06 UTC (rev 15521)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.project 2009-05-26 20:48:54 UTC (rev 15522)
@@ -16,7 +16,7 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
+ <name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name>
<arguments>
</arguments>
</buildCommand>
@@ -25,18 +25,13 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.hibernate.eclipse.console.hibernateBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
+ <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.jboss.tools.seam.core.seamnature</nature>
- <nature>org.hibernate.eclipse.console.hibernateNature</nature>
</natures>
</projectDescription>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2009-05-26 20:44:06 UTC (rev 15521)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2009-05-26 20:48:54 UTC (rev 15522)
@@ -477,11 +477,11 @@
}
public void testFactoriesValidator() {
- IFile �omponent12File = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/Component12.java");
+ IFile component12File = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/Component12.java");
refreshProject(project);
- int number = getMarkersNumber(�omponent12File);
+ int number = getMarkersNumber(component12File);
assertTrue("Problem marker was found in Component12.java", number == 0);
// Unknown factory name
@@ -489,7 +489,7 @@
IFile �omponent12File2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/Component12.2");
try{
- �omponent12File.setContents(�omponent12File2.getContents(), true, false, null);
+ component12File.setContents(�omponent12File2.getContents(), true, false, null);
}catch(Exception ex){
JUnitUtils.fail("Error in changing 'Component12File2.java' content to " +
"'Component12File2.2'", ex);
@@ -497,20 +497,20 @@
refreshProject(project);
- number = getMarkersNumber(�omponent12File);
+ number = getMarkersNumber(component12File);
assertFalse("Problem marker 'Unknown factory name' was not found", number == 0);
- String[] messages = getMarkersMessage(�omponent12File);
+ String[] messages = getMarkersMessage(component12File);
assertEquals("Problem marker 'Unknown factory name' was not found", "Factory method \"messageList2\" with a void return type must have an associated @Out/Databinder", messages[0]);
- int[] lineNumbers = getMarkersNumbersOfLine(�omponent12File);
+ int[] lineNumbers = getMarkersNumbersOfLine(component12File);
assertEquals("Problem marker has wrong line number", 24, lineNumbers[0]);
�omponent12File2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory");
try{
- �omponent12File.setContents(�omponent12File2.getContents(), true, false, null);
+ component12File.setContents(�omponent12File2.getContents(), true, false, null);
}catch(Exception ex){
JUnitUtils.fail("Error in changing 'Component12File2.java' content to " +
"'DuplicateFactory'", ex);
@@ -518,7 +518,7 @@
refreshProject(project);
- number = getMarkersNumber(�omponent12File);
+ number = getMarkersNumber(component12File);
assertEquals("Duplicate factory name markers were not found", 2, number);
}
14 years, 11 months
JBoss Tools SVN: r15521 - in trunk/seam: tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-05-26 16:44:06 -0400 (Tue, 26 May 2009)
New Revision: 15521
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.project
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4378 Fixed
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 2009-05-26 18:07:05 UTC (rev 15520)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-05-26 20:44:06 UTC (rev 15521)
@@ -36,7 +36,6 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.seam.core.BijectedAttributeType;
import org.jboss.tools.seam.core.IBijectedAttribute;
-import org.jboss.tools.seam.core.IRole;
import org.jboss.tools.seam.core.ISeamAnnotatedFactory;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamComponentDeclaration;
@@ -284,22 +283,13 @@
private void validateAnnotatedFactory(ISeamAnnotatedFactory factory, Set<String> markedDuplicateFactoryNames) {
IMember sourceMember = factory.getSourceMember();
if(sourceMember instanceof IMethod) {
- IMethod method = (IMethod)sourceMember;
- try {
- String returnType = method.getReturnType();
- if("V".equals(returnType)) { //$NON-NLS-1$
- // return type is void
- String factoryName = factory.getName();
- if(factoryName==null) {
- // Unknown factory name
- SeamCorePlugin.getDefault().logError(NLS.bind(SeamCoreMessages.SEAM_CORE_VALIDATOR_FACTORY_METHOD_MUST_HAVE_NAME,factory.getResource()));
- return;
- }
- validateFactoryName(factory, factoryName, markedDuplicateFactoryNames, true);
- }
- } catch (JavaModelException e) {
- SeamCorePlugin.getDefault().logError(SeamCoreMessages.SEAM_CORE_VALIDATOR_ERROR_VALIDATING_SEAM_CORE, e);
+ String factoryName = factory.getName();
+ if(factoryName==null) {
+ // Unknown factory name
+ SeamCorePlugin.getDefault().logError(NLS.bind(SeamCoreMessages.SEAM_CORE_VALIDATOR_FACTORY_METHOD_MUST_HAVE_NAME,factory.getResource()));
+ return;
}
+ validateFactoryName(factory, factoryName, markedDuplicateFactoryNames, true);
} else {
// factory must be java method!
// JDT should mark it.
@@ -341,7 +331,23 @@
if(firstDuplicateVariableWasMarked) {
markedDuplicateFactoryNames.add(factoryName);
}
- if(unknownVariable && validateUnknownName) {
+ boolean voidReturnType = false;
+ if(factory instanceof ISeamAnnotatedFactory) {
+ IMember sourceMember = ((ISeamAnnotatedFactory)factory).getSourceMember();
+ if(sourceMember instanceof IMethod) {
+ IMethod method = (IMethod)sourceMember;
+ try {
+ String returnType = method.getReturnType();
+ if("V".equals(returnType)) { //$NON-NLS-1$
+ // return type is void
+ voidReturnType = true;
+ }
+ } catch (JavaModelException e) {
+ SeamCorePlugin.getDefault().logError(SeamCoreMessages.SEAM_CORE_VALIDATOR_ERROR_VALIDATING_SEAM_CORE, e);
+ }
+ }
+ }
+ if(unknownVariable && validateUnknownName && voidReturnType) {
// mark unknown factory name
// save link to factory resource
validationContext.addLinkedCoreResource(factoryName, factory.getSourcePath());
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory 2009-05-26 20:44:06 UTC (rev 15521)
@@ -0,0 +1,25 @@
+package org.domain.SeamWebWarTestProject.session;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Factory;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.datamodel.DataModel;
+import org.jboss.seam.log.Log;
+import org.jboss.seam.core.FacesMessages;
+
+@Name("component12")
+public class Component12 {
+ @Factory("testFactory1")
+ public String getComp() {
+ return "";
+ }
+
+ @Factory("testFactory1")
+ public String getComp2() {
+ return "";
+ }
+}
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.project 2009-05-26 18:07:05 UTC (rev 15520)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.project 2009-05-26 20:44:06 UTC (rev 15521)
@@ -16,7 +16,7 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
@@ -25,13 +25,18 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.hibernate.eclipse.console.hibernateBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
- <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.jboss.tools.seam.core.seamnature</nature>
+ <nature>org.hibernate.eclipse.console.hibernateNature</nature>
</natures>
</projectDescription>
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-05-26 18:07:05 UTC (rev 15520)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-05-26 20:44:06 UTC (rev 15521)
@@ -13,10 +13,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.tools.seam.core.test.project.facet.Seam12XFacetTestSuite121EAP;
-import org.jboss.tools.seam.core.test.project.facet.Seam20XFacetTestSuite201GA;
-import org.jboss.tools.seam.core.test.project.facet.Seam2FacetInstallDelegateTest;
-import org.jboss.tools.seam.core.test.project.facet.SeamFacetInstallDelegateTest;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeListConverterTest;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeManagerTest;
import org.jboss.tools.seam.core.test.refactoring.SeamRefactoringAllTests;
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2009-05-26 18:07:05 UTC (rev 15520)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2009-05-26 20:44:06 UTC (rev 15521)
@@ -477,19 +477,19 @@
}
public void testFactoriesValidator() {
- IFile Component12File = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/Component12.java");
+ IFile �omponent12File = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/Component12.java");
refreshProject(project);
- int number = getMarkersNumber(Component12File);
+ int number = getMarkersNumber(�omponent12File);
assertTrue("Problem marker was found in Component12.java", number == 0);
// Unknown factory name
System.out.println("Test - Unknown factory name");
- IFile Component12File2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/Component12.2");
+ IFile �omponent12File2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/Component12.2");
try{
- Component12File.setContents(Component12File2.getContents(), true, false, null);
+ �omponent12File.setContents(�omponent12File2.getContents(), true, false, null);
}catch(Exception ex){
JUnitUtils.fail("Error in changing 'Component12File2.java' content to " +
"'Component12File2.2'", ex);
@@ -497,18 +497,31 @@
refreshProject(project);
- number = getMarkersNumber(Component12File);
+ number = getMarkersNumber(�omponent12File);
assertFalse("Problem marker 'Unknown factory name' was not found", number == 0);
- String[] messages = getMarkersMessage(Component12File);
+ String[] messages = getMarkersMessage(�omponent12File);
assertEquals("Problem marker 'Unknown factory name' was not found", "Factory method \"messageList2\" with a void return type must have an associated @Out/Databinder", messages[0]);
- int[] lineNumbers = getMarkersNumbersOfLine(Component12File);
+ int[] lineNumbers = getMarkersNumbersOfLine(�omponent12File);
assertEquals("Problem marker has wrong line number", 24, lineNumbers[0]);
+
+ �omponent12File2 = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory");
+ try{
+ �omponent12File.setContents(�omponent12File2.getContents(), true, false, null);
+ }catch(Exception ex){
+ JUnitUtils.fail("Error in changing 'Component12File2.java' content to " +
+ "'DuplicateFactory'", ex);
+ }
+
+ refreshProject(project);
+
+ number = getMarkersNumber(�omponent12File);
+ assertEquals("Duplicate factory name markers were not found", 2, number);
}
-
+
public void testBijectionsValidator() {
IFile selectionTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java");
IFile selectionIndexTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java");
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-05-26 18:07:05 UTC (rev 15520)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamComponentRefactoringTest.java 2009-05-26 20:44:06 UTC (rev 15521)
@@ -3,13 +3,13 @@
import java.util.ArrayList;
import java.util.List;
+import junit.framework.TestCase;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamProject;
@@ -18,8 +18,6 @@
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
-import junit.framework.TestCase;
-
public class SeamComponentRefactoringTest extends TestCase {
static String warProjectName = "Test1";
static String earProjectName = "Test1-ear";
@@ -56,6 +54,7 @@
private ISeamProject loadSeamProject(IProject project) throws CoreException {
JobUtils.waitForIdle();
+
System.out.println("Project - "+project);
ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
assertNotNull("Seam project for " + project.getName() + " is null", seamProject);
@@ -113,7 +112,6 @@
}
private void renameComponent(ISeamProject seamProject, String componentName, String newName, List<TestChangeStructure> changeList) throws CoreException{
-
// Test before renaming
ISeamComponent component = seamProject.getComponent(componentName);
assertNotNull(component);
@@ -125,9 +123,8 @@
assertNotSame(changeStructure.getText(), content.substring(changeStructure.getOffset(), changeStructure.getOffset()+changeStructure.getLength()));
}
- if(component.getJavaDeclaration() == null)
- fail("Component 'test' does not have java declaration");
-
+ assertNotNull("Component " + component.getName() + " does not have java declaration.", component.getJavaDeclaration());
+
// Rename Seam Component
RenameComponentProcessor processor = new RenameComponentProcessor(component);
processor.setNewComponentName(newName);
14 years, 11 months
JBoss Tools SVN: r15520 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog: common and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2009-05-26 14:07:05 -0400 (Tue, 26 May 2009)
New Revision: 15520
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4370
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-05-26 18:03:53 UTC (rev 15519)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-05-26 18:07:05 UTC (rev 15520)
@@ -258,7 +258,9 @@
}
public void releaseResources() {
-
+
+ preview.releaseModel();
+
if (cssModel != null) {
cssModel.release();
cssModel = null;
@@ -301,6 +303,7 @@
}
public void reinit() {
+ preview.releaseModel();
cssModel.setFile(file);
cssModel.reinit();
preview.reinit(cssModel);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2009-05-26 18:03:53 UTC (rev 15519)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2009-05-26 18:07:05 UTC (rev 15520)
@@ -220,7 +220,7 @@
public void release() {
IModelManager modelManager = StructuredModelManager.getModelManager();
- if ((model != null) && !modelManager.isShared(model.getId()) /* copy */) {
+ if ((model != null) /* && !modelManager.isShared(model.getId()) */) {
model.releaseFromEdit();
}
model = null;
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java 2009-05-26 18:03:53 UTC (rev 15519)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java 2009-05-26 18:07:05 UTC (rev 15520)
@@ -81,9 +81,15 @@
}
public void reinit(ICSSDialogModel cssModel) {
+ this.cssModel = cssModel;
viewer.setDocument(cssModel.getDocument());
}
+ public void releaseModel() {
+ viewer.setDocument(null);
+ cssModel = null;
+ }
+
/**
*
* @param selector
14 years, 11 months
JBoss Tools SVN: r15519 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-05-26 14:03:53 -0400 (Tue, 26 May 2009)
New Revision: 15519
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4262
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java 2009-05-26 17:07:23 UTC (rev 15518)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamComponentRenameHandler.java 2009-05-26 18:03:53 UTC (rev 15519)
@@ -51,6 +51,8 @@
public Object execute(ExecutionEvent event) throws ExecutionException {
IEditorPart editor = HandlerUtil.getActiveEditor(event);
Shell activeShell = HandlerUtil.getActiveShell(event);
+
+ saveAndBuild();
IEditorInput input = editor.getEditorInput();
if (input instanceof IFileEditorInput) {
@@ -79,15 +81,8 @@
}
public static void invokeRenameWizard(ISeamComponent component, Shell activeShell) {
- if(!SeamGuiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().saveAllEditors(true))
- return;
+ saveAndBuild();
- try {
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
- } catch (InterruptedException e) {
- // do nothing
- }
-
RenameComponentProcessor processor = new RenameComponentProcessor(component);
RenameComponentRefactoring refactoring = new RenameComponentRefactoring(processor);
RenameComponentWizard wizard = new RenameComponentWizard(refactoring, component);
@@ -99,4 +94,15 @@
// operation was canceled
}
}
+
+ private static void saveAndBuild(){
+ if(!SeamGuiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().saveAllEditors(true))
+ return;
+
+ try {
+ Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
+ } catch (InterruptedException e) {
+ // do nothing
+ }
+ }
}
14 years, 11 months
JBoss Tools SVN: r15518 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3969 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-05-26 13:07:23 -0400 (Tue, 26 May 2009)
New Revision: 15518
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3969/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3969/jbide3969.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3969Test.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3969,check if element in parent have select item or not has been added for mac os platform
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3969/jbide3969.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3969/jbide3969.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3969/jbide3969.xhtml 2009-05-26 17:07:23 UTC (rev 15518)
@@ -0,0 +1,12 @@
+<!DOCTYPE html 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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+<ui:composition template="">
+<h:selectOneMenu value="#{test.test}">
+<div>a<div>t</div></div>
+</h:selectOneMenu>
+</ui:composition>
+</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-05-26 16:37:03 UTC (rev 15517)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-05-26 17:07:23 UTC (rev 15518)
@@ -55,6 +55,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3632Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3650Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3734Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3969Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4037Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4373Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
@@ -140,6 +141,7 @@
suite.addTestSuite(JBIDE3197Test.class);
suite.addTestSuite(JBIDE4373Test.class);
suite.addTestSuite(JBIDE675Test.class);
+ suite.addTestSuite(JBIDE3969Test.class);
// $JUnit-END$
// added by Max Areshkau
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3969Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3969Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3969Test.java 2009-05-26 17:07:23 UTC (rev 15518)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 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.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ * @author mareshkau
+ *
+ */
+public class JBIDE3969Test extends VpeTest{
+
+ public JBIDE3969Test(String name) {
+ super(name);
+ }
+
+ public void testCorrectCustomElements() throws Throwable {
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath("JBIDE/3969/jbide3969.xhtml",
+ JsfAllTests.IMPORT_PROJECT_NAME);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ checkSourceSelection(part);
+
+ // check exception
+ if (getException() != null) {
+ throw getException();
+ }
+ }
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2009-05-26 16:37:03 UTC (rev 15517)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2009-05-26 17:07:23 UTC (rev 15518)
@@ -396,7 +396,7 @@
}else {
getIFlasher().setColor(flasherHiddentElementColor);
}
- getIFlasher().drawElementOutline(element);
+ drawElementOutline(element);
}else {
getIFlasher().setColor(flasherHiddentElementColor);
@@ -404,7 +404,7 @@
if(domElement!=null) {
- getIFlasher().drawElementOutline(domElement);
+ drawElementOutline(domElement);
}
}
@@ -561,17 +561,17 @@
getIFlasher().setColor(flasherHiddentElementColor);
}
- getIFlasher().drawElementOutline(getLastSelectedElement());
+ drawElementOutline(getLastSelectedElement());
}else {
getIFlasher().setColor(flasherHiddentElementColor);
nsIDOMElement domElement = findVisbleParentElement(getLastSelectedElement());
if(domElement!=null) {
- getIFlasher().drawElementOutline(domElement);
+ drawElementOutline(domElement);
}
}
- } else if(getIFlasher()!=null&&Platform.getOSArch().equals(Platform.OS_MACOSX)){
+ } else if(getIFlasher()!=null&&Platform.OS_MACOSX.equals(Platform.getOS())){
//Max Areshkau (bug on Mac OS X, when we switch to preview from other view, selection rectangle doesn't disappear
//TODO Max Areshkau (may be exist passability not draw selection on resize event when we switches to other view)
try {
@@ -653,6 +653,34 @@
return null;
}
+ /**
+ * Decorator
+ * @author mareshkau
+ * @param domElement arround which border will be shown
+ *
+ */
+ private void drawElementOutline(nsIDOMElement domElement) {
+ //fix for JBIDE-3969
+ if(Platform.OS_MACOSX.equals(Platform.getOS())&&hasSelectInParenNodes(domElement.getParentNode())) {
+ return;
+ }
+ getIFlasher().drawElementOutline(domElement);
+ }
+ /**
+ * Checks if node has select in parent node, if has it's cause crash
+ * on OSX and xulrunner 1.8.1.3
+ * @param domElement
+ * @return
+ */
+ private boolean hasSelectInParenNodes(nsIDOMNode domNode){
+ if(domNode==null) {
+ return false;
+ }else if("select".equalsIgnoreCase(domNode.getNodeName())){
+ return true;
+ } else {
+ return hasSelectInParenNodes(domNode.getParentNode());
+ }
+ }
}
14 years, 11 months