May 2009 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r15497 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: META-INF and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2009-05-25 18:35:22 -0400 (Mon, 25 May 2009) New Revision: 15497 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/EventListenerClassNameSection.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayClassNameSection.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayExpressionSection.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayLanguageSection.java Removed: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ClassNameSection.java Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF 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/model/ExclusiveGateway.java Log: - Decision attributes and subelements (GPD-325) - No namespace updates (GPD-338) Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF 2009-05-25 21:22:02 UTC (rev 15496) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/META-INF/MANIFEST.MF 2009-05-25 22:35:22 UTC (rev 15497) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.flow.jpdl4;singleton:=true -Bundle-Version: 1.0.0.beta2 +Bundle-Version: 1.0.0.CR1 Bundle-Vendor: %Bundle-Vendor.0 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.jboss.tools.flow.common;bundle-version="1.0.0", Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-05-25 21:22:02 UTC (rev 15496) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-05-25 22:35:22 UTC (rev 15497) @@ -355,8 +355,8 @@ <input type="org.jboss.tools.flow.jpdl4.model.EventListenerContainer"/> </propertySection> <propertySection - class="org.jboss.tools.flow.jpdl4.properties.ClassNameSection" - id="org.jboss.tools.jpdl4.className" + class="org.jboss.tools.flow.jpdl4.properties.EventListenerClassNameSection" + id="org.jboss.tools.jpdl4.eventListener.className" tab="org.jboss.tools.jpdl4.general"> <input type="org.jboss.tools.flow.jpdl4.model.EventListener"/> </propertySection> @@ -370,24 +370,45 @@ <propertySection afterSection="org.jboss.tools.jpdl4.name" class="org.jboss.tools.flow.jpdl4.properties.ProcessKeySection" - id="org.jboss.tools.jpdl4.processKey" + id="org.jboss.tools.jpdl4.process.key" tab="org.jboss.tools.jpdl4.general"> <input type="org.jboss.tools.flow.jpdl4.model.Process"/> </propertySection> <propertySection - afterSection="org.jboss.tools.jpdl4.processKey" + afterSection="org.jboss.tools.jpdl4.process.key" class="org.jboss.tools.flow.jpdl4.properties.ProcessVersionSection" - id="org.jboss.tools.jpdl4.processVersion" + id="org.jboss.tools.jpdl4.process.version" tab="org.jboss.tools.jpdl4.general"> <input type="org.jboss.tools.flow.jpdl4.model.Process"/> </propertySection> <propertySection - afterSection="org.jboss.tools.jpdl4.processVersion" + afterSection="org.jboss.tools.jpdl4.process.version" class="org.jboss.tools.flow.jpdl4.properties.ProcessDescriptionSection" - id="org.jboss.tools.jpdl4.processDescription" + id="org.jboss.tools.jpdl4.process.description" tab="org.jboss.tools.jpdl4.general"> <input type="org.jboss.tools.flow.jpdl4.model.Process"/> </propertySection> + <propertySection + afterSection="org.jboss.tools.jpdl4.name" + class="org.jboss.tools.flow.jpdl4.properties.ExclusiveGatewayLanguageSection" + id="org.jboss.tools.jpdl4.exclusivegateway.language" + tab="org.jboss.tools.jpdl4.general"> + <input type="org.jboss.tools.flow.jpdl4.model.ExclusiveGateway"/> + </propertySection> + <propertySection + afterSection="org.jboss.tools.jpdl4.exclusivegateway.language" + class="org.jboss.tools.flow.jpdl4.properties.ExclusiveGatewayExpressionSection" + id="org.jboss.tools.jpdl4.exclusivegateway.expression" + tab="org.jboss.tools.jpdl4.general"> + <input type="org.jboss.tools.flow.jpdl4.model.ExclusiveGateway"/> + </propertySection> + <propertySection + afterSection="org.jboss.tools.jpdl4.exclusivegateway.expression" + class="org.jboss.tools.flow.jpdl4.properties.ExclusiveGatewayClassNameSection" + id="org.jboss.tools.jpdl4.exclusivegateway.classname" + tab="org.jboss.tools.jpdl4.general"> + <input type="org.jboss.tools.flow.jpdl4.model.ExclusiveGateway"/> + </propertySection> </propertySections> </extension> <extension 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-25 21:22:02 UTC (rev 15496) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2009-05-25 22:35:22 UTC (rev 15497) @@ -21,6 +21,7 @@ import org.jboss.tools.flow.jpdl4.model.AssignmentPropertySource; import org.jboss.tools.flow.jpdl4.model.EventListener; import org.jboss.tools.flow.jpdl4.model.EventListenerContainer; +import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway; import org.jboss.tools.flow.jpdl4.model.HumanTask; import org.jboss.tools.flow.jpdl4.model.Process; import org.jboss.tools.flow.jpdl4.model.SubprocessTask; @@ -88,6 +89,16 @@ } } + class ExclusiveGatewayAttributeHandler extends NodeAttributeHandler { + public void deserializeAttributes(Wrapper wrapper, Element element) { + super.deserializeAttributes(wrapper, element); + if (!(wrapper.getElement() instanceof ExclusiveGateway)) return; + ExclusiveGateway exclusiveGateWay = (ExclusiveGateway)wrapper.getElement(); + exclusiveGateWay.setExpr(element.getAttribute("expr")); + exclusiveGateWay.setLang(element.getAttribute("lang")); + } + } + class HumanTaskAttributeHandler extends NodeAttributeHandler { AssignmentAttributeHandler assignmentAttributeHandler = new AssignmentAttributeHandler(); public void deserializeAttributes(Wrapper wrapper, Element element) { @@ -278,6 +289,18 @@ } } + class ExclusiveGateWayChildNodeHandler extends NodeChildNodeHandler { + public Wrapper deserializeChildNode(Wrapper parent, Node node) { + Wrapper result = super.deserializeChildNode(parent, node); + 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); + } + return result; + } + } + class ProcessPostProcessor implements PostProcessor { @SuppressWarnings("unchecked") public void postProcess(Wrapper wrapper) { @@ -387,6 +410,8 @@ return new HumanTaskAttributeHandler(); } else if (element instanceof SubprocessTask) { return new SubprocessTaskAttributeHandler(); + } else if (element instanceof ExclusiveGateway) { + return new ExclusiveGatewayAttributeHandler(); } else { return new NodeAttributeHandler(); } @@ -396,13 +421,22 @@ if (wrapper instanceof FlowWrapper) { return new ProcessChildNodeHandler(); } else if (wrapper instanceof NodeWrapper) { - return new NodeChildNodeHandler(); + return getNodeChildNodeDeserializer(wrapper); } else if (wrapper instanceof DefaultWrapper) { return getDefaultChildNodeHandler(wrapper); } return null; } + private ChildNodeDeserializer getNodeChildNodeDeserializer(Wrapper wrapper) { + Object element = wrapper.getElement(); + if (element instanceof ExclusiveGateway) { + return new ExclusiveGateWayChildNodeHandler(); + } else { + return new NodeChildNodeHandler(); + } + } + private ChildNodeDeserializer getDefaultChildNodeHandler(Wrapper wrapper) { if (wrapper.getElement() != null && wrapper.getElement() instanceof EventListenerContainer) { return new EventListenerContainerChildNodeHandler(); 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-25 21:22:02 UTC (rev 15496) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-05-25 22:35:22 UTC (rev 15497) @@ -173,6 +173,8 @@ public void appendClosing(StringBuffer buffer, Wrapper wrapper) { buffer.append("</" + getNodeName(wrapper.getElement()) + ">"); } + public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) { + } } private String getNodeName(Element element) { @@ -280,6 +282,8 @@ appendName(buffer, (ProcessNode)element); } else if ("g".equals(attributeName)) { appendGraphics(buffer, (NodeWrapper)wrapper); + } else { + super.appendAttributeToSave(attributeName, buffer, wrapper); } } protected void appendName(StringBuffer buffer, ProcessNode processNode) { @@ -299,11 +303,45 @@ buffer.append(constraint.height); buffer.append("\""); } + public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) { + NodeWrapper nodeWrapper = (NodeWrapper)wrapper; + List<ConnectionWrapper> children = nodeWrapper.getOutgoingConnections(); + for (ConnectionWrapper connectionWrapper : children) { + appendToBuffer(buffer, connectionWrapper, level+1); + } + } } - class HumanTaskSerializer extends ProcessNodeWrapperSerializer { + class ExclusiveGatewayWrapperSerializer extends ProcessNodeWrapperSerializer { protected List<String> getAttributesToSave() { List<String> result = super.getAttributesToSave(); + result.add("expr"); + result.add("lang"); + return result; + } + protected String getPropertyName(String attributeName) { + if ("expr".equals(attributeName)) { + return ExclusiveGateway.EXPR; + } else if ("repeat".equals(attributeName)) { + return ExclusiveGateway.LANG; + } + return super.getPropertyName(attributeName); + } + public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) { + ExclusiveGateway exclusiveGateway = (ExclusiveGateway)wrapper.getElement(); + String handler = exclusiveGateway.getHandler(); + if (handler != null && !"".equals(handler)) { + buffer.append("\n"); + appendPadding(buffer, level + 1); + buffer.append("<handler class=\"" + handler + "\" />"); + } + super.appendBody(buffer, wrapper, level); + } + } + + class HumanTaskWrapperSerializer extends ProcessNodeWrapperSerializer { + protected List<String> getAttributesToSave() { + List<String> result = super.getAttributesToSave(); result.add(Assignment.ASSIGNEE); result.add(Assignment.CANDIDATE_GROUPS); result.add(Assignment.SWIMLANE); @@ -397,7 +435,7 @@ } } - class SubprocessTaskWrapperSerializer extends AbstractWrapperSerializer { + class SubprocessTaskWrapperSerializer extends ProcessNodeWrapperSerializer { protected List<String> getAttributesToSave() { ArrayList<String> result = new ArrayList<String>(); result.add("sub-process-id"); @@ -429,6 +467,15 @@ } return super.getPropertyName(attributeName); } + public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) { + List<Element> eventListeners = wrapper.getChildren(EventListenerContainer.LISTENERS); + if (eventListeners != null) { + for (Element eventListener : eventListeners) { + if (!(eventListener instanceof Wrapper)) continue; + appendToBuffer(buffer, (Wrapper)eventListener, level+1); + } + } + } } class EventListenerWrapperSerializer extends AbstractWrapperSerializer { @@ -475,8 +522,8 @@ appendDescription(buffer, (Process)element); } else if ("initial".equals(attributeName)) { appendInitial(buffer, (Process)element); - } else if ("xmlns".equals(attributeName)) { - buffer.append(" xmlns=\"http://jbpm.org/4/jpdl\""); + } else { + super.appendAttributeToSave(attributeName, buffer, wrapper); } } protected void appendName(StringBuffer buffer, Process process) { @@ -508,6 +555,35 @@ if (value == null || "".equals(value)) return; buffer.append(" description=\"" + value + "\""); } + public void appendBody(StringBuffer buffer, Wrapper wrapper, int level) { + FlowWrapper flowWrapper = (FlowWrapper)wrapper; + List<Element> swimlanes = flowWrapper.getChildren("swimlane"); + if (swimlanes != null) { + for (Element swimlane : swimlanes) { + if (!(swimlane instanceof Wrapper)) continue; + appendToBuffer(buffer, (Wrapper)swimlane, level+1); + } + } + List<Element> timers = flowWrapper.getChildren("timer"); + if (timers != null) { + for (Element timer : timers) { + if (!(timer instanceof Wrapper)) continue; + appendToBuffer(buffer, (Wrapper)timer, level+1); + } + } + List<Element> eventListenerContainers = flowWrapper.getChildren("eventListener"); + if (eventListenerContainers != null) { + for (Element eventListenerContainer : eventListenerContainers) { + if (!(eventListenerContainer instanceof Wrapper)) continue; + appendToBuffer(buffer, (Wrapper)eventListenerContainer, level+1); + } + } + ContainerWrapper containerWrapper = (ContainerWrapper)wrapper; + List<NodeWrapper> children = containerWrapper.getNodeWrappers(); + for (NodeWrapper nodeWrapper : children) { + appendToBuffer(buffer, nodeWrapper, level+1); + } + } } private void appendOpening(StringBuffer buffer, Wrapper wrapper, int level) { @@ -539,11 +615,11 @@ } else if (element instanceof ServiceTask) { new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level); } else if (element instanceof HumanTask) { - new HumanTaskSerializer().appendOpening(buffer, wrapper, level); + new HumanTaskWrapperSerializer().appendOpening(buffer, wrapper, level); } else if (element instanceof SubprocessTask) { new SubprocessTaskWrapperSerializer().appendOpening(buffer, wrapper, level); } else if (element instanceof ExclusiveGateway) { - new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level); + new ExclusiveGatewayWrapperSerializer().appendOpening(buffer, wrapper, level); } else if (element instanceof ForkParallelGateway) { new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level); } else if (element instanceof JoinParallelGateway) { @@ -564,54 +640,54 @@ @SuppressWarnings("unchecked") private void appendBody(StringBuffer buffer, Wrapper wrapper, int level) { - if (wrapper instanceof FlowWrapper) { - FlowWrapper flowWrapper = (FlowWrapper)wrapper; - List<Element> swimlanes = flowWrapper.getChildren("swimlane"); - if (swimlanes != null) { - for (Element swimlane : swimlanes) { - if (!(swimlane instanceof Wrapper)) continue; - appendToBuffer(buffer, (Wrapper)swimlane, level+1); - } - } - List<Element> timers = flowWrapper.getChildren("timer"); - if (timers != null) { - for (Element timer : timers) { - if (!(timer instanceof Wrapper)) continue; - appendToBuffer(buffer, (Wrapper)timer, level+1); - } - } - List<Element> eventListenerContainers = flowWrapper.getChildren("eventListener"); - if (eventListenerContainers != null) { - for (Element eventListenerContainer : eventListenerContainers) { - if (!(eventListenerContainer instanceof Wrapper)) continue; - appendToBuffer(buffer, (Wrapper)eventListenerContainer, level+1); - } - } + Element element = wrapper.getElement(); + if (element instanceof SequenceFlow) { + new SequenceFlowWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof TerminateEndEvent) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof ErrorEndEvent) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof CancelEndEvent) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof StartEvent) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof SuperState) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof WaitTask) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof HqlTask) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof SqlTask) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof JavaTask) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof ScriptTask) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof MailTask) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof ServiceTask) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof HumanTask) { + new HumanTaskWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof SubprocessTask) { + new SubprocessTaskWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof ExclusiveGateway) { + new ExclusiveGatewayWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof ForkParallelGateway) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof JoinParallelGateway) { + new ProcessNodeWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof Process) { + new ProcessWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof Swimlane) { + new SwimlaneWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof Timer) { + new TimerWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof EventListenerContainer) { + new EventListenerContainerWrapperSerializer().appendBody(buffer, wrapper, level); + } else if (element instanceof EventListener) { + new EventListenerWrapperSerializer().appendBody(buffer, wrapper, level); } - if (wrapper instanceof ContainerWrapper) { - ContainerWrapper containerWrapper = (ContainerWrapper)wrapper; - List<NodeWrapper> children = containerWrapper.getNodeWrappers(); - for (NodeWrapper nodeWrapper : children) { - appendToBuffer(buffer, nodeWrapper, level+1); - } - } - if (wrapper instanceof NodeWrapper) { - NodeWrapper nodeWrapper = (NodeWrapper)wrapper; - List<ConnectionWrapper> children = nodeWrapper.getOutgoingConnections(); - for (ConnectionWrapper connectionWrapper : children) { - appendToBuffer(buffer, connectionWrapper, level+1); - } - } - Element element = (Element)wrapper.getElement(); - if (element instanceof EventListenerContainer) { - List<Element> eventListeners = wrapper.getChildren(EventListenerContainer.LISTENERS); - if (eventListeners != null) { - for (Element eventListener : eventListeners) { - if (!(eventListener instanceof Wrapper)) continue; - appendToBuffer(buffer, (Wrapper)eventListener, level+1); - } - } - } ArrayList<Node> trailingNodeList = (ArrayList<Node>)element.getMetaData("trailingNodes"); boolean appendTrailingNodes = trailingNodeList != null && !trailingNodeList.isEmpty(); if (appendTrailingNodes) { Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java 2009-05-25 21:22:02 UTC (rev 15496) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java 2009-05-25 22:35:22 UTC (rev 15497) @@ -1,10 +1,97 @@ package org.jboss.tools.flow.jpdl4.model; +import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.eclipse.ui.views.properties.IPropertySource; + public class ExclusiveGateway extends Gateway { + + public static final String LANG = "lang"; + public static final String EXPR = "expr"; + public static final String HANDLER = "handler"; + + private String lang; + private String expr; + private String handler; + + public ExclusiveGateway() { + setMetaData("propertySource", new PropertySource()); + } protected boolean isPropagationExclusive() { return true; } + public String getLang() { + return lang; + } + + public void setLang(String lang) { + this.lang = lang; + } + + public String getExpr() { + return expr; + } + + public void setExpr(String expr) { + this.expr = expr; + } + + public String getHandler() { + return handler; + } + + public void setHandler(String handler) { + this.handler = handler; + } + + private class PropertySource implements IPropertySource { + + public IPropertyDescriptor[] getPropertyDescriptors() { + return new IPropertyDescriptor[0]; + } + + public Object getPropertyValue(Object id) { + if (LANG.equals(id)) { + return getLang(); + } else if (EXPR.equals(id)) { + return getExpr(); + } else if (HANDLER.equals(id)) { + return getHandler(); + } else { + return null; + } + } + + public boolean isPropertySet(Object id) { + if (LANG.equals(id)) { + return getName() != null; + } else if (EXPR.equals(id)) { + return getExpr() != null; + } else if (HANDLER.equals(id)) { + return getHandler() != null; + } else { + return false; + } + } + + public void resetPropertyValue(Object id) { + } + + public void setPropertyValue(Object id, Object value) { + if (LANG.equals(id)) { + setLang((String)value); + } else if (EXPR.equals(id)) { + setExpr((String)value); + } else if (HANDLER.equals(id)) { + setHandler((String)value); + } + } + + public Object getEditableValue() { + return null; + } + + } } Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ClassNameSection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ClassNameSection.java 2009-05-25 21:22:02 UTC (rev 15496) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ClassNameSection.java 2009-05-25 22:35:22 UTC (rev 15497) @@ -1,11 +0,0 @@ -package org.jboss.tools.flow.jpdl4.properties; - -import org.jboss.tools.flow.jpdl4.model.EventListener; - -public class ClassNameSection extends TextFieldPropertySection { - - public ClassNameSection() { - super(EventListener.CLASS_NAME, "Class"); - } - -} Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/EventListenerClassNameSection.java (from rev 15356, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ClassNameSection.java) =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/EventListenerClassNameSection.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/EventListenerClassNameSection.java 2009-05-25 22:35:22 UTC (rev 15497) @@ -0,0 +1,11 @@ +package org.jboss.tools.flow.jpdl4.properties; + +import org.jboss.tools.flow.jpdl4.model.EventListener; + +public class EventListenerClassNameSection extends TextFieldPropertySection { + + public EventListenerClassNameSection() { + super(EventListener.CLASS_NAME, "Class"); + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/EventListenerClassNameSection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayClassNameSection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayClassNameSection.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayClassNameSection.java 2009-05-25 22:35:22 UTC (rev 15497) @@ -0,0 +1,11 @@ +package org.jboss.tools.flow.jpdl4.properties; + +import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway; + +public class ExclusiveGatewayClassNameSection extends TextFieldPropertySection { + + public ExclusiveGatewayClassNameSection() { + super(ExclusiveGateway.HANDLER, "Handler Class"); + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayClassNameSection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayExpressionSection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayExpressionSection.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayExpressionSection.java 2009-05-25 22:35:22 UTC (rev 15497) @@ -0,0 +1,11 @@ +package org.jboss.tools.flow.jpdl4.properties; + +import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway; + +public class ExclusiveGatewayExpressionSection extends TextFieldPropertySection { + + public ExclusiveGatewayExpressionSection() { + super(ExclusiveGateway.EXPR, "Expression"); + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayExpressionSection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayLanguageSection.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayLanguageSection.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayLanguageSection.java 2009-05-25 22:35:22 UTC (rev 15497) @@ -0,0 +1,11 @@ +package org.jboss.tools.flow.jpdl4.properties; + +import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway; + +public class ExclusiveGatewayLanguageSection extends TextFieldPropertySection { + + public ExclusiveGatewayLanguageSection() { + super(ExclusiveGateway.LANG, "Language"); + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/ExclusiveGatewayLanguageSection.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15496 - in trunk/flow/plugins/org.jboss.tools.flow.common: src/org/jboss/tools/flow/common/wrapper and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2009-05-25 17:22:02 -0400 (Mon, 25 May 2009) New Revision: 15496 Modified: trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractWrapper.java Log: removal of ConcurrentModificationException when removing a node from a process Modified: trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF 2009-05-25 17:25:50 UTC (rev 15495) +++ trunk/flow/plugins/org.jboss.tools.flow.common/META-INF/MANIFEST.MF 2009-05-25 21:22:02 UTC (rev 15496) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.flow.common;singleton:=true -Bundle-Version: 1.0.0.beta2 +Bundle-Version: 1.0.0.CR1 Bundle-Activator: org.jboss.tools.flow.common.Activator Bundle-Vendor: %Bundle-Vendor.0 Require-Bundle: Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractWrapper.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractWrapper.java 2009-05-25 17:25:50 UTC (rev 15495) +++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractWrapper.java 2009-05-25 21:22:02 UTC (rev 15496) @@ -97,8 +97,8 @@ } public void notifyListeners(ModelEvent event) { - for (ModelListener listener: listeners) { - listener.modelChanged(event); + for (int i = 0; i < listeners.size(); i++) { + listeners.get(i).modelChanged(event); } }

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15495 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2009-05-25 13:25:50 -0400 (Mon, 25 May 2009) New Revision: 15495 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java Log: https://jira.jboss.org/jira/browse/JBIDE-4311, html tags and attribute names and values were changed into lowercase, null value check was added to ui:params value replacement. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2009-05-25 16:42:06 UTC (rev 15494) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2009-05-25 17:25:50 UTC (rev 15495) @@ -145,7 +145,11 @@ initClasses(sourceNode, pageContext); nsIDOMNode visualNode = creationData.getNode(); - if (visualNode != null && visualNode.getNodeName().equals(HTML.TAG_TBODY)) { + /* + * https://jira.jboss.org/jira/browse/JBIDE-4311 + * Tag name can be in any case. + */ + if (visualNode != null && visualNode.getNodeName().equalsIgnoreCase(HTML.TAG_TBODY)) { // we are called by VpeVisualDomBuilder addStylesToCells(visualDocument, visualNode); } else { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java 2009-05-25 16:42:06 UTC (rev 15494) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java 2009-05-25 17:25:50 UTC (rev 15495) @@ -100,6 +100,15 @@ private String replacePattern(String origStr, String target, String replacement) { + + /* + * https://jira.jboss.org/jira/browse/JBIDE-4311 + * target string could be null in some case. + */ + if (null == origStr || null == target) { + return origStr; + } + StringBuilder sb = new StringBuilder(); String word = "((\\w+)([\\.\\[\\]]*))"; Matcher m; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2009-05-25 16:42:06 UTC (rev 15494) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2009-05-25 17:25:50 UTC (rev 15495) @@ -20,47 +20,47 @@ private HTML() { } - public static final String TAG_HTML = "HTML"; //$NON-NLS-1$ - public static final String TAG_HEAD = "HEAD"; //$NON-NLS-1$ - public static final String TAG_BODY = "BODY"; //$NON-NLS-1$ - public static final String TAG_IMG = "IMG"; //$NON-NLS-1$ - public static final String TAG_LINK = "LINK"; //$NON-NLS-1$ - public static final String TAG_SELECT = "SELECT"; //$NON-NLS-1$ - public static final String TAG_OPTION = "OPTION"; //$NON-NLS-1$ - public static final String TAG_STYLE = "STYLE"; //$NON-NLS-1$ - public static final String TAG_TABLE = "TABLE"; //$NON-NLS-1$ - public static final String TAG_TBODY = "TBODY"; //$NON-NLS-1$ - public static final String TAG_THEAD = "THEAD"; //$NON-NLS-1$ - public static final String TAG_TFOOT = "TFOOT"; //$NON-NLS-1$ - public static final String TAG_CAPTION = "CAPTION"; //$NON-NLS-1$ - public static final String TAG_TH = "TH"; //$NON-NLS-1$ - public static final String TAG_TR = "TR"; //$NON-NLS-1$ - public static final String TAG_TD = "TD"; //$NON-NLS-1$ - public static final String TAG_DL = "DL"; //$NON-NLS-1$ - public static final String TAG_DT = "DT"; //$NON-NLS-1$ - public static final String TAG_DD = "DD"; //$NON-NLS-1$ - public static final String TAG_COL = "COL"; //$NON-NLS-1$ - public static final String TAG_COLS = "COLS"; //$NON-NLS-1$ - public static final String TAG_COLGROUP = "COLGROUP"; //$NON-NLS-1$ - public static final String TAG_BR = "BR"; //$NON-NLS-1$ - public static final String TAG_LI = "LI"; //$NON-NLS-1$ - public static final String TAG_DIV = "DIV"; //$NON-NLS-1$ - public static final String TAG_SPAN = "SPAN"; //$NON-NLS-1$ - public static final String TAG_P = "P"; //$NON-NLS-1$ - public static final String TAG_TEXTAREA = "TEXTAREA"; //$NON-NLS-1$ - public static final String TAG_INPUT = "INPUT"; //$NON-NLS-1$ - public static final String TAG_BUTTON = "BUTTON"; //$NON-NLS-1$ - public static final String TAG_OL = "OL"; //$NON-NLS-1$ - public static final String TAG_UL = "UL"; //$NON-NLS-1$ - public static final String TAG_CODE = "CODE"; //$NON-NLS-1$ - public static final String TAG_PRE = "PRE"; //$NON-NLS-1$ - public static final String TAG_B = "B"; //$NON-NLS-1$ - public static final String TAG_I = "I"; //$NON-NLS-1$ - public static final String TAG_U = "U"; //$NON-NLS-1$ - public static final String TAG_LABEL = "LABEL"; //$NON-NLS-1$ - public static final String TAG_A = "A"; //$NON-NLS-1$ - public static final String TAG_H1 = "H1"; //$NON-NLS-1$ - public static final String TAG_FORM = "FORM"; //$NON-NLS-1$ + public static final String TAG_HTML = "html"; //$NON-NLS-1$ + public static final String TAG_HEAD = "head"; //$NON-NLS-1$ + public static final String TAG_BODY = "body"; //$NON-NLS-1$ + public static final String TAG_IMG = "img"; //$NON-NLS-1$ + public static final String TAG_LINK = "link"; //$NON-NLS-1$ + public static final String TAG_SELECT = "select"; //$NON-NLS-1$ + public static final String TAG_OPTION = "option"; //$NON-NLS-1$ + public static final String TAG_STYLE = "style"; //$NON-NLS-1$ + public static final String TAG_TABLE = "table"; //$NON-NLS-1$ + public static final String TAG_TBODY = "tbody"; //$NON-NLS-1$ + public static final String TAG_THEAD = "thead"; //$NON-NLS-1$ + public static final String TAG_TFOOT = "tfoot"; //$NON-NLS-1$ + public static final String TAG_CAPTION = "caption"; //$NON-NLS-1$ + public static final String TAG_TH = "th"; //$NON-NLS-1$ + public static final String TAG_TR = "tr"; //$NON-NLS-1$ + public static final String TAG_TD = "td"; //$NON-NLS-1$ + public static final String TAG_DL = "dl"; //$NON-NLS-1$ + public static final String TAG_DT = "dt"; //$NON-NLS-1$ + public static final String TAG_DD = "dd"; //$NON-NLS-1$ + public static final String TAG_COL = "col"; //$NON-NLS-1$ + public static final String TAG_COLS = "cols"; //$NON-NLS-1$ + public static final String TAG_COLGROUP = "colgroup"; //$NON-NLS-1$ + public static final String TAG_BR = "br"; //$NON-NLS-1$ + public static final String TAG_LI = "li"; //$NON-NLS-1$ + public static final String TAG_DIV = "div"; //$NON-NLS-1$ + public static final String TAG_SPAN = "span"; //$NON-NLS-1$ + public static final String TAG_P = "p"; //$NON-NLS-1$ + public static final String TAG_TEXTAREA = "textarea"; //$NON-NLS-1$ + public static final String TAG_INPUT = "input"; //$NON-NLS-1$ + public static final String TAG_BUTTON = "button"; //$NON-NLS-1$ + public static final String TAG_OL = "ol"; //$NON-NLS-1$ + public static final String TAG_UL = "ul"; //$NON-NLS-1$ + public static final String TAG_CODE = "code"; //$NON-NLS-1$ + public static final String TAG_PRE = "pre"; //$NON-NLS-1$ + public static final String TAG_B = "b"; //$NON-NLS-1$ + public static final String TAG_I = "i"; //$NON-NLS-1$ + public static final String TAG_U = "u"; //$NON-NLS-1$ + public static final String TAG_LABEL = "label"; //$NON-NLS-1$ + public static final String TAG_A = "a"; //$NON-NLS-1$ + public static final String TAG_H1 = "h1"; //$NON-NLS-1$ + public static final String TAG_FORM = "form"; //$NON-NLS-1$ /**Use this class if you want to wrap a text node in a span that * must not affect visual representation of the text node. @@ -68,16 +68,16 @@ * See also EditorOverride.css .*/ public static final String CLASS_VPE_TEXT = "vpe-text"; //$NON-NLS-1$ - public static final String ATTR_ID = "ID"; //$NON-NLS-1$ - public static final String ATTR_TYPE = "TYPE"; //$NON-NLS-1$ - public static final String ATTR_TEXT = "TEXT"; //$NON-NLS-1$ + public static final String ATTR_ID = "id"; //$NON-NLS-1$ + public static final String ATTR_TYPE = "type"; //$NON-NLS-1$ + public static final String ATTR_TEXT = "text"; //$NON-NLS-1$ public static final String ATTR_CLASS = "class"; //$NON-NLS-1$ - public static final String ATTR_TITLE = "TITLE"; //$NON-NLS-1$ - public static final String ATTR_NAME = "NAME"; //$NON-NLS-1$ + public static final String ATTR_TITLE = "title"; //$NON-NLS-1$ + public static final String ATTR_NAME = "name"; //$NON-NLS-1$ public static final String ATTR_VALUE = "value"; //$NON-NLS-1$ public static final String ATTR_STYLE = "style"; //$NON-NLS-1$ public static final String ATTR_SIZE = "size"; //$NON-NLS-1$ - public static final String ATTR_MULTIPLE = "MULTIPLE"; //$NON-NLS-1$ + public static final String ATTR_MULTIPLE = "multiple"; //$NON-NLS-1$ public static final String ATTR_COLSPAN = "colspan"; //$NON-NLS-1$ public static final String ATTR_CELLSPACING = "cellspacing"; //$NON-NLS-1$ public static final String ATTR_CELLPADDING = "cellpadding"; //$NON-NLS-1$ @@ -86,7 +86,7 @@ public static final String ATTR_HSPACE = "hspace"; //$NON-NLS-1$ public static final String ATTR_VSPACE = "vspace"; //$NON-NLS-1$ public static final String ATTR_BORDER = "border"; //$NON-NLS-1$ - public static final String ATTR_FOR = "FOR"; //$NON-NLS-1$ + public static final String ATTR_FOR = "for"; //$NON-NLS-1$ public static final String ATTR_DIR = "dir"; //$NON-NLS-1$ public static final String ATTR_DISABLED = "disabled"; //$NON-NLS-1$ public static final String ATTR_FRAME = "frame"; //$NON-NLS-1$

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15494 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2009-05-25 12:42:06 -0400 (Mon, 25 May 2009) New Revision: 15494 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java Log: this is temporary solution just to fix build Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2009-05-25 16:23:56 UTC (rev 15493) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2009-05-25 16:42:06 UTC (rev 15494) @@ -21,7 +21,6 @@ import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersistenceUnit; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaEntity; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGenericGenerator; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGenericGeneratorImpl; @@ -48,7 +47,8 @@ */ @Override public JavaIdMapping buildJavaIdMapping(JavaPersistentAttribute parent) { - return new HibernateJavaIdMapping(parent); + //return new HibernateJavaIdMapping(parent); + return null; } public JavaGenericGenerator buildJavaGenericGenerator(JavaJpaContextNode parent) {

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15493 - trunk/vpe/plugins/org.jboss.tools.vpe/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2009-05-25 12:23:56 -0400 (Mon, 25 May 2009) New Revision: 15493 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/JBIDE-4123, required dependecy have been added Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2009-05-25 16:07:41 UTC (rev 15492) +++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2009-05-25 16:23:56 UTC (rev 15493) @@ -75,6 +75,7 @@ org.jboss.tools.jst.web, org.jboss.tools.vpe.resref, org.jboss.tools.common.el.core, - org.jboss.tools.common.el.ui + org.jboss.tools.common.el.ui, + org.eclipse.core.expressions;bundle-version="3.4.100" Bundle-Version: 2.1.0

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15492 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF and 14 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2009-05-25 12:07:41 -0400 (Mon, 25 May 2009) New Revision: 15492 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/inputName.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamDecorateTemplate.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeElementMapping.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCustomTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java Log: https://jira.jboss.org/jira/browse/JBIDE-4373 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/META-INF/MANIFEST.MF 2009-05-25 16:07:41 UTC (rev 15492) @@ -11,6 +11,7 @@ org.jboss.tools.jst.jsp, org.mozilla.xpcom, org.jboss.tools.jsf.vpe.richfaces;bundle-version="2.1.0", - org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0" + org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0", + org.eclipse.jface.text;bundle-version="3.5.0" Eclipse-LazyStart: true Bundle-Vendor: %Bundle-Vendor.0 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2009-05-25 16:07:41 UTC (rev 15492) @@ -13,7 +13,8 @@ org.jboss.tools.vpe, org.eclipse.core.resources, org.jboss.tools.jst.jsp, - org.mozilla.xpcom + org.mozilla.xpcom, + org.eclipse.jface.text;bundle-version="3.5.0" Export-Package: org.jboss.tools.jsf.vpe.facelets, org.jboss.tools.jsf.vpe.facelets.template Bundle-Version: 2.1.0 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeCompositionTemplate.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -10,14 +10,18 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.facelets.template; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.jsf.vpe.facelets.template.util.Facelets; import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.template.VpeDefineContainerTemplate; import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -37,12 +41,12 @@ protected VpeCreationData createStub(String fileName, Node sourceElement, nsIDOMDocument visualDocument) { nsIDOMElement container = visualDocument.createElement(HTML.TAG_DIV); - container.setAttribute("style", "border: 1px dashed #2A7F00"); + container.setAttribute("style", "border: 1px dashed #2A7F00"); //$NON-NLS-1$ //$NON-NLS-2$ VpeVisualDomBuilder.markIncludeElement(container); nsIDOMElement title = visualDocument.createElement(HTML.TAG_DIV); nsIDOMElement tag = visualDocument.createElement(HTML.TAG_SPAN); - tag.setAttribute("class", "__any__tag__caption"); + tag.setAttribute("class", "__any__tag__caption"); //$NON-NLS-1$ //$NON-NLS-2$ tag.appendChild(visualDocument.createTextNode(sourceElement.getNodeName())); title.appendChild(tag); if (fileName != null) { @@ -52,8 +56,16 @@ return new VpeCreationData(container); } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getSourceRegionForOpenOn(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMNode) + */ @Override - public boolean recreateAtAttrChange(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument,nsIDOMElement visualNode, Object data, String name, String value) { - return true; + public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, + Node sourceNode, nsIDOMNode domNode) { + Element sourceElement = (Element) sourceNode; + Node paramAttr = sourceElement.getAttributeNode(Facelets.ATTR_TEMPLATE); + return new Region(NodesManagingUtil.getStartOffsetNode(paramAttr),0); } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDecorateTemplate.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -10,10 +10,14 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.facelets.template; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.jsf.vpe.facelets.template.util.Facelets; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -24,4 +28,15 @@ String fileName = ((Element)sourceNode).getAttribute(Facelets.ATTR_TEMPLATE); return createTemplate(fileName, pageContext, sourceNode, visualDocument); } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getSourceRegionForOpenOn(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMNode) + */ + @Override + public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, + Node sourceNode, nsIDOMNode domNode) { + Element sourceElement = (Element) sourceNode; + Node paramAttr = sourceElement.getAttributeNode(Facelets.ATTR_TEMPLATE); + return new Region(NodesManagingUtil.getStartOffsetNode(paramAttr),0); + } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -10,11 +10,15 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jstl.template; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.jsf.vpe.jstl.template.util.Jstl; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.template.VpeDefineContainerTemplate; +import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -26,4 +30,14 @@ return createTemplate(fileName, pageContext, sourceNode, visualDocument); } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getSourceRegionForOpenOn(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMNode) + */ + @Override + public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, + Node sourceNode, nsIDOMNode domNode) { + Element sourceElement = (Element) sourceNode; + Node paramAttr = sourceElement.getAttributeNode(Jstl.ATTR_URL); + return new Region(NodesManagingUtil.getStartOffsetNode(paramAttr),0); + } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/META-INF/MANIFEST.MF 2009-05-25 16:07:41 UTC (rev 15492) @@ -10,7 +10,8 @@ org.jboss.tools.common, org.jboss.tools.vpe, org.mozilla.xpcom, - org.jboss.tools.jst.jsp + org.jboss.tools.jst.jsp, + org.eclipse.jface.text;bundle-version="3.5.0" Eclipse-LazyStart: true Export-Package: org.jboss.tools.jsf.vpe.myfaces, org.jboss.tools.jsf.vpe.myfaces.template Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2009-05-25 16:07:41 UTC (rev 15492) @@ -14,7 +14,8 @@ org.eclipse.ui.workbench.texteditor, org.eclipse.ui.ide, org.mozilla.xpcom, - org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0" + org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0", + org.eclipse.jface.text;bundle-version="3.5.0" Bundle-Vendor: %Bundle-Vendor.0 Eclipse-LazyStart: true Bundle-ClassPath: lib/antlr.jar, Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamDecorateTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamDecorateTemplate.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamDecorateTemplate.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -1,13 +1,17 @@ package org.jboss.tools.jsf.vpe.seam.template; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil; import org.jboss.tools.jsf.vpe.seam.template.util.Seam; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.template.VpeDefineContainerTemplate; import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -42,5 +46,14 @@ return creationData; } - + /* (non-Javadoc) + * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getSourceRegionForOpenOn(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMNode) + */ + @Override + public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, + Node sourceNode, nsIDOMNode domNode) { + Element sourceElement = (Element) sourceNode; + Node paramAttr = sourceElement.getAttributeNode(Seam.ATTR_TEMPLATE); + return new Region(NodesManagingUtil.getStartOffsetNode(paramAttr),0); + } } Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/inputName.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/inputName.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/inputName.xhtml 2009-05-25 16:07:41 UTC (rev 15492) @@ -0,0 +1,13 @@ +<!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" + xmlns:c="http://java.sun.com/jstl/core"> + + <f:loadBundle basename="resources" var="msg" /> + + <ui:composition template="/templates/common.xhtml"> + + </ui:composition> +</html> 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-25 12:17:38 UTC (rev 15491) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -56,6 +56,7 @@ 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.JBIDE4037Test; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4373Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test; @@ -138,6 +139,7 @@ suite.addTestSuite(JBIDE3632Test.class); suite.addTestSuite(JBIDE3650Test.class); suite.addTestSuite(JBIDE3197Test.class); + suite.addTestSuite(JBIDE4373Test.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/JBIDE4373Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -0,0 +1,94 @@ +/******************************************************************************* + * 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.runtime.CoreException; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl; +import org.jboss.tools.common.model.impl.CustomizedObjectImpl; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.editor.util.SelectionUtil; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; +import org.mozilla.interfaces.nsIDOMNode; +import org.w3c.dom.Node; + + +/** + * + * Junit test for JBIDE-4373 + * @author mareshkau + * + */ +public class JBIDE4373Test extends VpeTest{ + + public JBIDE4373Test(String name) { + super(name); + } + + /** + * OpenOn test for Custom elements + */ + + public void testCorrectCustomElements() throws CoreException { + + VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "correctCustomTags.xhtml"); //$NON-NLS-1$ + int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 13, 8); + + Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position); + assertEquals("Name of node should be ma:paginator", "ma:paginator", sourceNode.getNodeName()); //$NON-NLS-1$ //$NON-NLS-2$ + nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode); + vpeController.getSourceBuilder().openOn(domNode); + IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + assertEquals("facelets.taglib.xml file should be opened","facelets.taglib.xml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$//$NON-NLS-2$ + StructuredSelection selection = (StructuredSelection) activeEditor.getEditorSite().getSelectionProvider().getSelection(); + CustomizedObjectImpl customizedObjectImpl = (CustomizedObjectImpl) selection.getFirstElement(); + //cheak if selection on right line, how? + assertEquals("Children lenght should be ","FileSystems/WEB-ROOT/tags/facelets.taglib.xml/paginator",customizedObjectImpl.getLongPath()); //$NON-NLS-1$ //$NON-NLS-2$ + + } + + /** + * test openOn for undefined template + */ + public void testIncorrectCustomElements() throws CoreException { + VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "incorrectCustomTags.xhtml"); //$NON-NLS-1$ + int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 9, 6); + + Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position); + assertEquals("Name of node should be", "ma:test", sourceNode.getNodeName()); //$NON-NLS-1$ //$NON-NLS-2$ + nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode); + vpeController.getSourceBuilder().openOn(domNode); + IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + assertEquals("facelets.taglib.xml file should be opened","facelets.taglib.xml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$//$NON-NLS-2$ + StructuredSelection selection = (StructuredSelection) activeEditor.getEditorSite().getSelectionProvider().getSelection(); + SimpleFileImpl customizedObjectImpl = (SimpleFileImpl) selection.getFirstElement(); + //cheak if selection on right line, how? + assertEquals("Children lenght should be","FileSystems/WEB-ROOT/tags/facelets.taglib.xml",customizedObjectImpl.getLongPath()); //$NON-NLS-1$ //$NON-NLS-2$ + + } + /** + * + * @throws CoreException + */ + public void testOpenOnforFacelets() throws CoreException { + VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "inputName.xhtml"); //$NON-NLS-1$ + int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 10, 38); + Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position); + nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode); + vpeController.getSourceBuilder().openOn(domNode); + IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + assertEquals("facelets.taglib.xml file should be opened","common.xhtml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$ + } +} Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -24,6 +24,7 @@ import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.TextEvent; import org.eclipse.jface.text.formatter.IContentFormatter; +import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.jface.text.source.IOverviewRuler; import org.eclipse.jface.text.source.ISourceViewer; @@ -164,6 +165,7 @@ super.setSourceViewerConfiguration(new JSPTextViewerConfiguration()); } + @Override protected void setSourceViewerConfiguration(SourceViewerConfiguration config) { if (config instanceof StructuredTextViewerConfigurationJSP) { if (!(config instanceof JSPTextViewerConfiguration)) { @@ -190,7 +192,6 @@ // Added By Max Areshkau // Fix for JBIDE-788 public IVisualContext getPageContext() { - if (pageContext == null) { pageContext = new SourceEditorPageContext(parentEditor); } @@ -1269,5 +1270,13 @@ } return false; } + /** + * + * @return HyperLinkDetectors for sourceRegion + */ + public IHyperlinkDetector[] getHyperlinkDetectors() { + + return getSourceViewerConfiguration().getHyperlinkDetectors(getSourceViewer()); + } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -1132,9 +1132,12 @@ } try { nsIDOMNode visualNode = VisualDomUtil.getTargetNode(mouseEvent); + if (visualNode != null) { + if (!sourceBuilder.openBundleEditors(visualNode)) { - sourceBuilder.openIncludeEditor(visualNode); + sourceBuilder.openOn(visualNode); +// sourceBuilder.openIncludeEditor(visualNode); } if (VpeDebug.PRINT_VISUAL_MOUSE_EVENT) { System.out.println("<<< mouseDblClick visualNode: " + visualNode.getNodeName() + //$NON-NLS-1$ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -14,8 +14,11 @@ import java.util.List; import java.util.Set; +import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.TextSelection; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.graphics.Point; @@ -29,7 +32,8 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.jboss.tools.vpe.VpePlugin; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; @@ -250,6 +254,39 @@ } } + /** + * + *This method calls when openOn event occures in + *visual part of VPE + * + * @param visualNode - node on which event has occured + * + * @author mareshkau + */ + + public void openOn(nsIDOMNode visualNode) { + + VpeNodeMapping nodeMapping = NodesManagingUtil.getNodeMapping( + this.domMapping, visualNode); + if (nodeMapping != null + && nodeMapping instanceof VpeElementMapping) { + + VpeElementMapping elementMapping = (VpeElementMapping) nodeMapping; + VpeTemplate template = elementMapping.getTemplate(); + IRegion regionForOpenOn = template.getSourceRegionForOpenOn(this.pageContext, elementMapping.getSourceNode(), visualNode); + IHyperlinkDetector [] hyperlinkDetectors = ((JSPTextEditor)this.sourceEditor).getHyperlinkDetectors(); + IHyperlink [] hyperLinks = null; + for (IHyperlinkDetector iHyperlinkDetector : hyperlinkDetectors) { + hyperLinks = iHyperlinkDetector.detectHyperlinks(this.sourceEditor.getTextViewer(), regionForOpenOn, true); + if(hyperLinks!=null && hyperLinks.length>0 && hyperLinks[0] instanceof AbstractHyperlink) { + AbstractHyperlink abstractHyperlink = (AbstractHyperlink) hyperLinks[0]; + abstractHyperlink.open(); + return; + } + } + } + } + boolean openBundleEditors(nsIDOMNode visualNode) { VpeNodeMapping nodeMapping = NodesManagingUtil.getNodeMapping( @@ -272,17 +309,17 @@ return false; } - boolean openIncludeEditor(nsIDOMNode visualNode) { - Node sourceNode = domMapping.getNearSourceNode(visualNode); - if (sourceNode != null && sourceNode.getNodeType() == Node.ELEMENT_NODE) { - VpeElementMapping elementMapping = (VpeElementMapping)domMapping.getNodeMapping(sourceNode); - if (elementMapping != null) { - VpeTemplate template = elementMapping.getTemplate(); - template.openIncludeEditor(pageContext, (Element)sourceNode, elementMapping.getData()); - } - } - return false; - } +// boolean openIncludeEditor(nsIDOMNode visualNode) { +// Node sourceNode = domMapping.getNearSourceNode(visualNode); +// if (sourceNode != null && sourceNode.getNodeType() == Node.ELEMENT_NODE) { +// VpeElementMapping elementMapping = (VpeElementMapping)domMapping.getNodeMapping(sourceNode); +// if (elementMapping != null) { +// VpeTemplate template = elementMapping.getTemplate(); +// template.openIncludeEditor(pageContext, (Element)sourceNode, elementMapping.getData()); +// } +// } +// return false; +// } boolean isEmptyDocument() { if (sourceDocument == null) return true; @@ -392,7 +429,7 @@ return null; } - Point getSelectionRange() { + public Point getSelectionRange() { return sourceEditor.getTextViewer().getSelectedRange(); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeElementMapping.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeElementMapping.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeElementMapping.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -65,14 +65,6 @@ return template; } -// public Map getXmlnsMap() { -// return xmlnsMap; -// } -// -// public void setXmlnsMap(Map xmlnsMap) { -// this.xmlnsMap = xmlnsMap; -// } - /** * @deprecated - You must use elementData. If VpeElementData has not * necessary functionality you must extend its Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -1226,16 +1226,16 @@ Element sourceElement, Object data) { } - /** - * Opens editor of source file for include-element. - * - * @param sourceElement The current element of the source tree. - * @param data The arbitrary data, built by a method <code>create</code> - * @param pageContext Contains the information on edited page. - */ - public void openIncludeEditor(VpePageContext pageContext, - Element sourceElement, Object data) { - } +// /** +// * Opens editor of source file for include-element. +// * +// * @param sourceElement The current element of the source tree. +// * @param data The arbitrary data, built by a method <code>create</code> +// * @param pageContext Contains the information on edited page. +// */ +// public void openIncludeEditor(VpePageContext pageContext, +// Element sourceElement, Object data) { +// } /** * The unfilled element of an source tree can be mapped in the visiblis @@ -1457,5 +1457,19 @@ public void setInvisible(boolean invisible) { this.invisible = invisible; } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.editor.template.VpeTemplate#getSourceRegionForOpenOn(org.mozilla.interfaces.nsIDOMNode) + * + */ + /** + * @author mareshkau + */ + public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, Node sourceNode ,nsIDOMNode domNode) { + int offset = NodesManagingUtil.getStartOffsetNode(sourceNode); + //calculate openOnPosition,prefixLengght+>+":" + offset+=sourceNode.getPrefix().length()+1+1; + return new Region(offset, 0); + } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCustomTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCustomTemplate.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCustomTemplate.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -12,18 +12,18 @@ import java.util.ArrayList; import java.util.List; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.ide.IDE; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.common.el.core.ELReferenceList; import org.jboss.tools.common.resref.core.ResourceReference; -import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeIncludeInfo; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.custom.CustomTLDReference; +import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Attr; @@ -90,28 +90,10 @@ visualDocument); creationData.setData(null); return creationData; - } + } @Override - public void openIncludeEditor(VpePageContext pageContext, - Element sourceElement, Object data) { - - IFile file = getFileForOpenOn(pageContext, sourceElement); - - if(file!=null && file.exists()) { - IWorkbenchPage workbenchPage = VpePlugin.getDefault() - .getWorkbench().getActiveWorkbenchWindow().getActivePage(); - try { - IDE.openEditor(workbenchPage, file,true); - } catch (PartInitException e) { - VpePlugin.reportProblem(e); - } - } - } - - @Override public void validate(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, VpeCreationData data){ - if(data.getData() instanceof TransferObject) { TransferObject trObject = (TransferObject) data.getData(); ELReferenceList.getInstance().setAllResources( @@ -151,32 +133,6 @@ addedAttrToElExpressions.toArray(new ResourceReference[0])); return resourceReferences; } - /** - * Looks for file to open on each editor, for open on click - * @param pageContext - * @param sourceElement - * @return file, if file has been founded or null otherwise - */ - private static IFile getFileForOpenOn(VpePageContext pageContext, - Element sourceElement) { - IPath pathToFile = CustomTLDReference - .getCustomElementPath(sourceElement, pageContext); - - IFile file =null; - - if(pathToFile!=null) { - file = ResourcesPlugin.getWorkspace().getRoot().getFile( - pathToFile); - } - //if we cann't find source file, then just open tld definition file - if(file==null || !file.exists()) { - pathToFile = CustomTLDReference.getCustomTLDPath(pageContext, - sourceElement); - file = ResourcesPlugin.getWorkspace().getRoot().getFile( - pathToFile); - } - return file; - } @Override public void beforeRemove(VpePageContext pageContext, Node sourceNode, @@ -189,6 +145,21 @@ } super.beforeRemove(pageContext, sourceNode, visualNode, file); } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.editor.template.VpeTemplate#getSourceRegionForOpenOn(org.mozilla.interfaces.nsIDOMNode) + * + */ + /** + * @author mareshkau + */ + @Override + public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, Node sourceNode ,nsIDOMNode domNode) { + int offset = NodesManagingUtil.getStartOffsetNode(sourceNode); + //calculate openOnPosition,prefixLengght+>+":" + offset+=sourceNode.getPrefix().length()+1+1; + return new Region(offset, 0); + } /** * Object which used to passing argument throw template event processing, @@ -222,5 +193,5 @@ public IFile getCustomFile() { return this.customFile; } - }; + } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -335,15 +335,15 @@ } - @Override - public void openIncludeEditor(VpePageContext pageContext, - Element sourceElement, Object data) { +// @Override +// public void openIncludeEditor(VpePageContext pageContext, +// Element sourceElement, Object data) { +// +// if (data instanceof TemplateFileInfo) { +// FileUtil.openEditor(((TemplateFileInfo) data).getTemplateFile()); +// } +// } - if (data instanceof TemplateFileInfo) { - FileUtil.openEditor(((TemplateFileInfo) data).getTemplateFile()); - } - } - protected VpeCreationData createStub(String fileName, Node sourceElement, nsIDOMDocument visualDocument) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -13,6 +13,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.jst.jsp.editor.ITextFormatter; @@ -24,10 +27,12 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsIDOMText; +import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -370,36 +375,11 @@ if (model != null) model.releaseFromRead(); } } - - /** * * Deprecated */ @Override - public void openIncludeEditor(VpePageContext pageContext, Element sourceElement, Object data) { - openIncludeEditor(pageContext, sourceElement, (Map<?,?>) data); - } - - private void openIncludeEditor(VpePageContext pageContext, Element sourceElement, Map<?,?> visualNodeMap) { - if (sourceElement != null) { - String file = null; - if ("jsp:directive.include".equals(sourceElement.getNodeName())) { - file = sourceElement.getAttribute("file"); - } else if ("jsp:include".equals(sourceElement.getNodeName())) { - file = sourceElement.getAttribute("page"); - } - if (file != null) { - pageContext.openIncludeFile(file); - } - } - } - - /** - * - * Deprecated - */ - @Override public void setSourceAttributeValue(VpePageContext pageContext, Element sourceElement, Object data) { setSourceAttributeValue(pageContext, sourceElement, (Map<?,?>)data); } @@ -595,4 +575,28 @@ } return null; } + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getSourceRegionForOpenOn(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMNode) + */ + /** + * @author mareshkau + */ + @Override + public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, + Node sourceNode, nsIDOMNode domNode) { + if(sourceNode != null && sourceNode instanceof Element) { + Attr file = null; + if ("jsp:directive.include".equals(sourceNode.getNodeName())) { //$NON-NLS-1$ + file = ((Element)sourceNode).getAttributeNode("file"); //$NON-NLS-1$ + } else if ("jsp:include".equals(sourceNode.getNodeName())) { //$NON-NLS-1$ + file = ((Element)sourceNode).getAttributeNode("page"); //$NON-NLS-1$ + } + + if(file!=null) { + return new Region(NodesManagingUtil.getStartOffsetNode(file),0); + } + } + return null; + } } \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -11,10 +11,13 @@ package org.jboss.tools.vpe.editor.template; import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeIncludeInfo; import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.expression.VpeAttributeOperand; import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; @@ -23,6 +26,7 @@ import org.jboss.tools.vpe.editor.util.FaceletUtil; import org.jboss.tools.vpe.editor.util.FileUtil; import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -144,22 +148,40 @@ return new VpeCreationData(visualNewElement); } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getSourceRegionForOpenOn(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMNode) + */ + /** + * @author mareshkau + */ @Override - public void openIncludeEditor(VpePageContext pageContext, Element sourceElement, Object data) { - if (sourceElement != null && fileNameExpression != null) { - VpeValue vpeValue; - try { - vpeValue = fileNameExpression.exec(pageContext, sourceElement); - if (vpeValue != null && vpeValue.stringValue().length() > 0) { - pageContext.openIncludeFile(vpeValue.stringValue()); - } - } catch (VpeExpressionException e) { - - VpePlugin.reportProblem(e); - } + public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, + Node sourceNode, nsIDOMNode domNode) { + + if (sourceNode != null && this.fileNameExpression != null && this.fileNameExpression instanceof VpeAttributeOperand) { + Element sourceElement = (Element) sourceNode; + Node paramAttr = sourceElement.getAttributeNode(((VpeAttributeOperand)this.fileNameExpression).getAttributeName()); + return new Region(NodesManagingUtil.getStartOffsetNode(paramAttr),0); } + return null; } +// @Override +// public void openIncludeEditor(VpePageContext pageContext, Element sourceElement, Object data) { +// if (sourceElement != null && fileNameExpression != null) { +// VpeValue vpeValue; +// try { +// vpeValue = fileNameExpression.exec(pageContext, sourceElement); +// if (vpeValue != null && vpeValue.stringValue().length() > 0) { +// pageContext.openIncludeFile(vpeValue.stringValue()); +// } +// } catch (VpeExpressionException e) { +// +// VpePlugin.reportProblem(e); +// } +// } +// } + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template; +import org.eclipse.jface.text.IRegion; import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo; import org.jboss.tools.vpe.editor.VpeSourceInnerDropInfo; @@ -360,18 +361,18 @@ void openBundleEditors(VpePageContext pageContext, Element sourceElement, Object data); - /** - * Opens editor of source file for include-element - * - * @param pageContext - * Contains the information on edited page. - * @param sourceElement - * The current element of the source tree. - * @param data - * The arbitrary data, built by a method <code>create</code> - */ - void openIncludeEditor(VpePageContext pageContext, Element sourceElement, - Object data); +// /** +// * Opens editor of source file for include-element +// * +// * @param pageContext +// * Contains the information on edited page. +// * @param sourceElement +// * The current element of the source tree. +// * @param data +// * The arbitrary data, built by a method <code>create</code> +// */ +// void openIncludeEditor(VpePageContext pageContext, Element sourceElement, +// Object data); /** * @deprecated @@ -487,4 +488,13 @@ public boolean isInvisible(); + /** + * Calculates and returns sourceRegion, on which we should + * make openOn action + * @param sourceNode - source node from element mapping + * @param domNode + * @return sourceRegion on which we should make openOn action + */ + public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, Node sourceNode,nsIDOMNode domNode); + } \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF 2009-05-25 16:07:41 UTC (rev 15492) @@ -10,7 +10,8 @@ org.jboss.tools.vpe, org.mozilla.xpcom, org.jboss.tools.jst.jsp, - org.jboss.tools.common + org.jboss.tools.common, + org.eclipse.jface.text;bundle-version="3.5.0" Eclipse-LazyStart: true Bundle-Localization: plugin Export-Package: org.jboss.tools.vpe.html.template Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java 2009-05-25 12:17:38 UTC (rev 15491) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java 2009-05-25 16:07:41 UTC (rev 15492) @@ -11,17 +11,22 @@ package org.jboss.tools.vpe.html.template; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.swt.graphics.Point; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.NodeData; import org.jboss.tools.vpe.editor.mapping.VpeElementData; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.jboss.tools.vpe.editor.util.TextUtil; import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Node; +import org.w3c.dom.ranges.RangeException; /** * @author mareshkau @@ -55,4 +60,17 @@ return result; } + +// /* (non-Javadoc) +// * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getSourceRegionForOpenOn(org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMNode) +// */ + @Override + public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, Node sourceNode, nsIDOMNode domNode) { + + Point selection = pageContext.getSourceBuilder().getSelectionRange(); + + return new Region(selection.x,0); + } + + }

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15491 - trunk/struts/docs/struts_tools_ref_guide/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-05-25 08:17:38 -0400 (Mon, 25 May 2009) New Revision: 15491 Modified: trunk/struts/docs/struts_tools_ref_guide/en/modules/projects.xml Log: https://jira.jboss.org/jira/browse/JBDS-621 - added the 'Relevant Resources Links' section to the 'Projects' chapter; Modified: trunk/struts/docs/struts_tools_ref_guide/en/modules/projects.xml =================================================================== --- trunk/struts/docs/struts_tools_ref_guide/en/modules/projects.xml 2009-05-25 12:16:54 UTC (rev 15490) +++ trunk/struts/docs/struts_tools_ref_guide/en/modules/projects.xml 2009-05-25 12:17:38 UTC (rev 15491) @@ -267,4 +267,10 @@ </figure> </section> + <section> + <title>Relevant Resources Links</title> + + <para>You can find more in-depth explanation on how to work with special wizards, editors and views that can + be used in various scenarios while developing Struts applications in our <ulink url="&jsflink;">Visual Web Tools guide</ulink>.</para> + </section> </chapter>

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15490 - trunk/jsf/docs/jsf_tools_ref_guide/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-05-25 08:16:54 -0400 (Mon, 25 May 2009) New Revision: 15490 Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/modules/projects.xml Log: https://jira.jboss.org/jira/browse/JBDS-621 - added the 'Relevant Resources Links' section to the 'Projects' chapter; Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/modules/projects.xml =================================================================== --- trunk/jsf/docs/jsf_tools_ref_guide/en/modules/projects.xml 2009-05-25 12:15:46 UTC (rev 15489) +++ trunk/jsf/docs/jsf_tools_ref_guide/en/modules/projects.xml 2009-05-25 12:16:54 UTC (rev 15490) @@ -1,462 +1,405 @@ <?xml version="1.0" encoding="UTF-8"?> <chapter id="projects"> - <?dbhtml filename="projects.html"?> - <chapterinfo> - <keywordset> - <keyword>JBoss Developer Studio</keyword> - <keyword>Eclipse</keyword> - <keyword>JSF Tools</keyword> - <keyword>Java</keyword> - <keyword>JBoss</keyword> - </keywordset> - </chapterinfo> - - <title>Projects</title> - <para>To take an advantage of JSF firstly you should perform one of the next - steps:</para> + <?dbhtml filename="projects.html"?> + <chapterinfo> + <keywordset> + <keyword>JBoss Developer Studio</keyword> + <keyword>Eclipse</keyword> + <keyword>JSF Tools</keyword> + <keyword>Java</keyword> + <keyword>JBoss</keyword> + </keywordset> + </chapterinfo> - <itemizedlist> - <listitem> - <para>Create new JSF projects</para> - </listitem> - <listitem> - <para>Import (open) existing JSF projects</para> - </listitem> - <listitem> - <para>Add JSF capability to any existing Eclipse - project</para> - </listitem> - <listitem> - <para>Import and add JSF capability to any existing project - created outside Eclipse.</para> - </listitem> - </itemizedlist> - <para>In this section we're going to stop on each of them in - detail.</para> - - <section id="new_jsf_project"> + <title>Projects</title> + <para>To take an advantage of JSF firstly you should perform one of the next steps:</para> - <title>Creating a New JSF Project</title> + <itemizedlist> + <listitem> + <para>Create new JSF projects</para> + </listitem> + <listitem> + <para>Import (open) existing JSF projects</para> + </listitem> + <listitem> + <para>Add JSF capability to any existing Eclipse project</para> + </listitem> + <listitem> + <para>Import and add JSF capability to any existing project created outside + Eclipse.</para> + </listitem> + </itemizedlist> + <para>In this section we're going to stop on each of them in detail.</para> - <para>If you want your project to already contain all JSF - libraries, tag libraries and JSF configuration file, just - organize a new brand JSF project. It is possible to do this easily with the - help of the special wizard. To get it, select<emphasis> - <property> File > New > Project - > JBoos Tools Web > JSF - > JSF Project</property> - </emphasis> and click <emphasis> - <property>Next</property>.</emphasis></para> + <section id="new_jsf_project"> - <figure> - <title>Choosing a JSF Project</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_10.png" - /> - </imageobject> - </mediaobject> - </figure> + <title>Creating a New JSF Project</title> - <para>On the next form you'll be prompted to enter - <property>Project Name</property> and select a - location for the project or just leave a default path.</para> - <para>Here, JSF Version also allows you to select which JSF - implementation to use.</para> - <figure> - <title>Creating a New JSF Project</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_11.png" - /> - </imageobject> - </mediaobject> - </figure> + <para>If you want your project to already contain all JSF libraries, tag libraries + and JSF configuration file, just organize a new brand JSF project. It is + possible to do this easily with the help of the special wizard. To get it, select<emphasis> + <property> File > New > Project > JBoos Tools + Web > JSF > JSF Project</property> + </emphasis> and click <emphasis> + <property>Next</property>.</emphasis></para> - <para>There is a number of predefined project templates that are flexible and - easily customizable. Thus you can pick a different template - on which the projects Importing Existing should be based on. Almost all - templates come in two variations: with jsf libraries and - without ones.</para> - <figure> - <title>Choosing JSF Templates</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_12.png " - /> - </imageobject> - </mediaobject> - </figure> + <figure> + <title>Choosing a JSF Project</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_10.png"/> + </imageobject> + </mediaobject> + </figure> - <para>The table below provides description for each possible JSF - template.</para> - <table> - <title>JSF Project Templates</title> - <tgroup cols="2"> - <colspec colnum="1" align="left" colwidth="1*"/> - <colspec colnum="2" colwidth="3*"/> + <para>On the next form you'll be prompted to enter <property>Project + Name</property> and select a location for the project or just leave + a default path.</para> + <para>Here, JSF Version also allows you to select which JSF implementation to + use.</para> + <figure> + <title>Creating a New JSF Project</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_11.png"/> + </imageobject> + </mediaobject> + </figure> + <para>There is a number of predefined project templates that are flexible and easily + customizable. Thus you can pick a different template on which the projects + Importing Existing should be based on. Almost all templates come in two + variations: with jsf libraries and without ones.</para> + <figure> + <title>Choosing JSF Templates</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_12.png " + /> + </imageobject> + </mediaobject> + </figure> - <thead> - <row> - <entry align="center"> + <para>The table below provides description for each possible JSF template.</para> + <table> + <title>JSF Project Templates</title> + <tgroup cols="2"> + <colspec colnum="1" align="left" colwidth="1*"/> + <colspec colnum="2" colwidth="3*"/> + + + <thead> + <row> + <entry align="center"> <para>Template</para> - </entry> + </entry> - <entry align="center"> + <entry align="center"> <para>Description</para> - </entry> - </row> - </thead> + </entry> + </row> + </thead> - <tbody> + <tbody> - <row> - <entry> + <row> + <entry> <para> <emphasis> <property>JSFBlankWithLibs</property> </emphasis> </para> - </entry> + </entry> - <entry> - <para>This template will - create a standard - Web project - structure with all - JSF - capabilities</para> - </entry> - </row> + <entry> + <para>This template will create a standard Web + project structure with all JSF capabilities</para> + </entry> + </row> - <row> - <entry> + <row> + <entry> <para> <emphasis> <property>JSFKickStartWithLibs</property> </emphasis> </para> - </entry> + </entry> - <entry> - <para>This template will - create a standard - Web project - structure but will - also include a - sample application - that is ready to - run</para> - </entry> - </row> + <entry> + <para>This template will create a standard Web + project structure but will also include a sample + application that is ready to run</para> + </entry> + </row> - <row> - <entry> + <row> + <entry> <para> <emphasis> <property>JSFKickStartWithoutLibs</property> </emphasis> </para> - </entry> + </entry> - <entry> - <para>Some servers already - provide jsf libs and - you take risk of - getting conflicting - libraries while - deploying your - project. To avoid - such conflicts, use - a template without - libs if you have a - server with its own - jsf libraries</para> - </entry> - </row> + <entry> + <para>Some servers already provide jsf libs and + you take risk of getting conflicting libraries + while deploying your project. To avoid such + conflicts, use a template without libs if you have + a server with its own jsf libraries</para> + </entry> + </row> - </tbody> - </tgroup> - </table> + </tbody> + </tgroup> + </table> -  - <para>On the next screen select what <emphasis> - <property>Servlet version</property> - </emphasis> to use and whether to register this application - with JBoss AS (or other server) for running and testing your application.</para> + <para>On the next screen select what <emphasis> + <property>Servlet version</property> + </emphasis> to use and whether to register this application with JBoss AS + (or other server) for running and testing your application.</para> - <para>The <emphasis> - <property>Context Path</property> - </emphasis> is the name under which the application will be - deployed.</para> + <para>The <emphasis> + <property>Context Path</property> + </emphasis> is the name under which the application will be deployed.</para> - <para>The <emphasis> - <property>Runtime</property> - </emphasis> value tells Eclipse where to find Web libraries - in order to build (compile) the project. It is not possible - to finish project creation without selecting Runtime. If you - don't have any values, select <emphasis> - <property>New...</property> - </emphasis> to add new Runtime.</para> + <para>The <emphasis> + <property>Runtime</property> + </emphasis> value tells Eclipse where to find Web libraries in order to + build (compile) the project. It is not possible to finish project creation + without selecting Runtime. If you don't have any values, select <emphasis> + <property>New...</property> + </emphasis> to add new Runtime.</para> - <para>The <emphasis> - <property>Target Server</property> - </emphasis> allows you specifying whether to deploy the - application. The Target Server corresponds to the Runtime - value selected above. If you don't want to deploy - the application, uncheck this value.</para> - <figure> - <title>Registering the Project on Server</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_14.png" - /> - </imageobject> - </mediaobject> - </figure> + <para>The <emphasis> + <property>Target Server</property> + </emphasis> allows you specifying whether to deploy the application. The + Target Server corresponds to the Runtime value selected above. If you + don't want to deploy the application, uncheck this value.</para> + <figure> + <title>Registering the Project on Server</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_14.png"/> + </imageobject> + </mediaobject> + </figure> - <para>When you are all done, you should have the project that has - been appeared in the Package Explorer view:</para> - <figure> - <title>A New Project in the Package Explorer</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_15.png" - /> - </imageobject> - </mediaobject> - </figure> + <para>When you are all done, you should have the project that has been appeared in + the Package Explorer view:</para> + <figure> + <title>A New Project in the Package Explorer</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_15.png"/> + </imageobject> + </mediaobject> + </figure> - <para>At this point you can open <emphasis> - <property>faces-config.xml</property> - </emphasis> and start working on your application. - There are a lot of features - to develop JSF applications. We will describe the features - further.</para> - </section> + <para>At this point you can open <emphasis> + <property>faces-config.xml</property> + </emphasis> and start working on your application. There are a lot of + features to develop JSF applications. We will describe the features + further.</para> + </section> - <section id="ImportingExsJSFProjWithAnyStr74447"> + <section id="ImportingExsJSFProjWithAnyStr74447"> - <title>Importing Existing JSF Projects with Any Structure</title> + <title>Importing Existing JSF Projects with Any Structure</title> - <para>For detailed information on migration of JSF projects into a workspace see <ulink - url="&migrationlink;#jsf_struts">Migration Guide</ulink>.</para> + <para>For detailed information on migration of JSF projects into a workspace see + <ulink url="&migrationlink;#jsf_struts">Migration + Guide</ulink>.</para> - </section> - <section id="add_jsf_capability"> + </section> + <section id="add_jsf_capability"> - <title>Adding JSF Capability to Any Existing Eclipse Project</title> + <title>Adding JSF Capability to Any Existing Eclipse Project</title> - <para>It's also possible to add <property>JSF capability</property> - (JSF libraries, tag libraries) to any existing Eclipse - project in your workspace. After that you'll be - able to make use of such editors as JSF configuration editor, JBoss - Tools JSP editor and any others.</para> - <para>Right click the project and select <emphasis> - <property>JBoss Tools > Add JSF - Capabilities</property>. </emphasis> This will start - the process of adding all necessary libraries, files to make - this a Web JSF project.</para> - <figure> - <title>Adding JSF Capabilities</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_16.png" - /> - </imageobject> - </mediaobject> - </figure> - <para>The wizard will first ask you to show the <emphasis> - <property>web.xml</property> - </emphasis> file location and the project name.</para> - <figure> - <title>Project Location</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_17.png" - /> - </imageobject> - </mediaobject> - </figure> - <para>On the last form you can set the different folders for your - project as well as register this application with a servlet - container.</para> + <para>It's also possible to add <property>JSF capability</property> (JSF + libraries, tag libraries) to any existing Eclipse project in your workspace. + After that you'll be able to make use of such editors as JSF + configuration editor, JBoss Tools JSP editor and any others.</para> + <para>Right click the project and select <emphasis> + <property>JBoss Tools > Add JSF Capabilities</property>. </emphasis> + This will start the process of adding all necessary libraries, files to make + this a Web JSF project.</para> + <figure> + <title>Adding JSF Capabilities</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_16.png"/> + </imageobject> + </mediaobject> + </figure> + <para>The wizard will first ask you to show the <emphasis> + <property>web.xml</property> + </emphasis> file location and the project name.</para> + <figure> + <title>Project Location</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_17.png"/> + </imageobject> + </mediaobject> + </figure> + <para>On the last form you can set the different folders for your project as well as + register this application with a servlet container.</para> - <para>Make sure to select <emphasis> - <property>Add Libraries</property> - </emphasis> to add all required JSF related libraries to this project.</para> + <para>Make sure to select <emphasis> + <property>Add Libraries</property> + </emphasis> to add all required JSF related libraries to this + project.</para> - <para>The <emphasis> - <property>Context Path</property> - </emphasis> is the name under which the application will be - deployed.</para> + <para>The <emphasis> + <property>Context Path</property> + </emphasis> is the name under which the application will be deployed.</para> - <para>The <emphasis> - <property>Runtime</property> - </emphasis> value tells Eclipse where to find Web libraries - in order to build (compile) the project. It is not possible - to finish project import without selecting Runtime. If you - don't have any values, select <emphasis> - <property>New...</property> - </emphasis> to add new Runtime.</para> + <para>The <emphasis> + <property>Runtime</property> + </emphasis> value tells Eclipse where to find Web libraries in order to + build (compile) the project. It is not possible to finish project import + without selecting Runtime. If you don't have any values, select <emphasis> + <property>New...</property> + </emphasis> to add new Runtime.</para> - <para>The <emphasis> - <property>Target Server</property> - </emphasis> allows you to specify whether to deploy the - application. The Target Server corresponds to the Runtime - value selected above. If you don't want to deploy - the application, uncheck this value.</para> - <figure> - <title>Project Folders</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_18.png" - /> - </imageobject> - </mediaobject> - </figure> - <para>Once your project is imported you can see that JSF related - libraries have been added to your project: <emphasis> - <property>jsf-api.jar</property> - </emphasis> and <emphasis> - <property>jsf-impl.jar</property> - </emphasis>.</para> - <note> - <title>Note:</title> - <para>Some application servers provide their own jsf - implementation libraries. Thus, to avoid conflicts you - should not add jsf libraries while adding jsf - capabilities.</para> - </note> - <para>You are now ready to work with JSF by creating a new JSF - configuration file:</para> + <para>The <emphasis> + <property>Target Server</property> + </emphasis> allows you to specify whether to deploy the application. The + Target Server corresponds to the Runtime value selected above. If you + don't want to deploy the application, uncheck this value.</para> + <figure> + <title>Project Folders</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_18.png"/> + </imageobject> + </mediaobject> + </figure> + <para>Once your project is imported you can see that JSF related libraries have been + added to your project: <emphasis> + <property>jsf-api.jar</property> + </emphasis> and <emphasis> + <property>jsf-impl.jar</property> + </emphasis>.</para> + <note> + <title>Note:</title> + <para>Some application servers provide their own jsf implementation + libraries. Thus, to avoid conflicts you should not add jsf libraries + while adding jsf capabilities.</para> + </note> + <para>You are now ready to work with JSF by creating a new JSF configuration + file:</para> - <figure> - <title>Creating a New JSF Configuration File</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_19.png" - /> - </imageobject> - </mediaobject> - </figure> + <figure> + <title>Creating a New JSF Configuration File</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_19.png"/> + </imageobject> + </mediaobject> + </figure> - <para>Once the file has been created, it should be opened in a - special <link - linkend="jsf_config_file" - >Faces Config Editor</link>.</para> - </section> - <section id="AddingYourOwnProjectTemplates853"> + <para>Once the file has been created, it should be opened in a special <link + linkend="jsf_config_file">Faces Config Editor</link>.</para> + </section> + <section id="AddingYourOwnProjectTemplates853"> - <title>Adding Your Own Project Templates</title> - <para>Template is a set of files that is served as a basis to facilitate - the creation of a new project. Project templates provide - content and structure for a project.</para> - <para>There is a powerful - templating capability for creating new and importing - existing Struts and JSF projects. This templating facility - has a variety of aspects to consider. But, let's - start with the most straightforward case and consider the - process of creating a template from your existing JSF - project.</para> + <title>Adding Your Own Project Templates</title> + <para>Template is a set of files that is served as a basis to facilitate the + creation of a new project. Project templates provide content and structure + for a project.</para> + <para>There is a powerful templating capability for creating new and importing + existing Struts and JSF projects. This templating facility has a variety of + aspects to consider. But, let's start with the most straightforward + case and consider the process of creating a template from your existing JSF + project.</para> - <para>Let's say you have a project that you want to use as - the basis for a new <property>template</property>. Follow - these steps to make a template out of it:</para> - <itemizedlist> - <listitem> - <para>In the Web Projects view, right-click the - project and select <emphasis> - <property>JBoss Tools JSF > Save As + <para>Let's say you have a project that you want to use as the basis for a + new <property>template</property>. Follow these steps to make a template out + of it:</para> + <itemizedlist> + <listitem> + <para>In the Web Projects view, right-click the project and select <emphasis> + <property>JBoss Tools JSF > Save As Template</property> - </emphasis></para> - </listitem> - </itemizedlist> - <figure> - <title>Saving Your Project as Template</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_20.png" - /> - </imageobject> - </mediaobject> - </figure> - <itemizedlist> - <listitem> - <para>In the first dialog box, you can choose a name - for the template (defaults to the project - name) and confirm what run-time - implementation of the project - technology will be used</para> - </listitem> + </emphasis></para> + </listitem> + </itemizedlist> + <figure> + <title>Saving Your Project as Template</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_20.png"/> + </imageobject> + </mediaobject> + </figure> + <itemizedlist> + <listitem> + <para>In the first dialog box, you can choose a name for the + template (defaults to the project name) and confirm what + run-time implementation of the project technology will be + used</para> + </listitem> - </itemizedlist> - <figure> - <title>Define Template Properties</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_20_1.png" - /> - </imageobject> - </mediaobject> - </figure> + </itemizedlist> + <figure> + <title>Define Template Properties</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_20_1.png" + /> + </imageobject> + </mediaobject> + </figure> - <itemizedlist> - <listitem> - <para>Select <emphasis> - <property>Next</property> - </emphasis> and you will be sent to a dialog - box with your project structure displayed - with check boxes. Here you can check only - those parts and files in your project - directory that should be part of the - template</para> - </listitem> - </itemizedlist> - <figure> - <title>Define Template Properties</title> - <mediaobject> - <imageobject> - <imagedata - fileref="images/jsf_support/jsf_support_20_2.png" - /> - </imageobject> - </mediaobject> - </figure> - <itemizedlist> - <listitem> - <para>At this point, unless you want to designate - some extra files as having Velocity template - coding inside them, you should click <emphasis> - <property>Finish</property> - </emphasis>.</para> - </listitem> - </itemizedlist> - <para>That's it. Now, you can use this template with any - new or imported project that uses the same run-time - implementation as the project you turned into a - template.</para> - <para>At this point, you have a fully configured project and now you can - bring some new logic to it starting from JSF configuration - file.</para> - </section> -</chapter> \ No newline at end of file + <itemizedlist> + <listitem> + <para>Select <emphasis> + <property>Next</property> + </emphasis> and you will be sent to a dialog box with your + project structure displayed with check boxes. Here you can + check only those parts and files in your project directory + that should be part of the template</para> + </listitem> + </itemizedlist> + <figure> + <title>Define Template Properties</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/jsf_support/jsf_support_20_2.png" + /> + </imageobject> + </mediaobject> + </figure> + <itemizedlist> + <listitem> + <para>At this point, unless you want to designate some extra files + as having Velocity template coding inside them, you should + click <emphasis> + <property>Finish</property> + </emphasis>.</para> + </listitem> + </itemizedlist> + <para>That's it. Now, you can use this template with any new or imported + project that uses the same run-time implementation as the project you turned + into a template.</para> + <para>At this point, you have a fully configured project and now you can bring some + new logic to it starting from JSF configuration file.</para> + </section> + <section> + <title>Relevant Resources Links</title> + + <para>You can find more in-depth explanation on how to work with special wizards, editors and views that can + be used in various scenarios while developing JSF applications in our <ulink url="&jsflink;">Visual Web Tools guide</ulink>.</para> + </section> +</chapter>

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15489 - trunk/jsf/docs/userguide/en.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-05-25 08:15:46 -0400 (Mon, 25 May 2009) New Revision: 15489 Modified: trunk/jsf/docs/userguide/en/master.xml Log: https://jira.jboss.org/jira/browse/JBDS-621 - adding new chapters; Modified: trunk/jsf/docs/userguide/en/master.xml =================================================================== --- trunk/jsf/docs/userguide/en/master.xml 2009-05-25 12:13:47 UTC (rev 15488) +++ trunk/jsf/docs/userguide/en/master.xml 2009-05-25 12:15:46 UTC (rev 15489) @@ -10,7 +10,9 @@ <!ENTITY richfaces_support SYSTEM "modules/richfaces_support.xml"> <!ENTITY web_projects SYSTEM "modules/web_projects.xml"> <!ENTITY preferences SYSTEM "modules/preferences.xml"> +<!ENTITY context_menu_preferences SYSTEM "modules/context_menu_preferences.xml"> <!ENTITY vwt_faq SYSTEM "modules/vwt_faq.xml"> +<!ENTITY conclusion SYSTEM "modules/conclusion.xml"> <!ENTITY seamlink "../../seam/html_single/index.html"> <!ENTITY aslink "../../as/html_single/index.html"> @@ -57,5 +59,7 @@ &richfaces_support; &web_projects; &preferences; + &context_menu_preferences; &vwt_faq; + &conclusion; </book>

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r15488 - trunk/jsf/docs/userguide/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-05-25 08:13:47 -0400 (Mon, 25 May 2009) New Revision: 15488 Modified: trunk/jsf/docs/userguide/en/modules/preferences.xml Log: https://jira.jboss.org/jira/browse/JBDS-621 - moving the conclusion sentences to the separate chapter; Modified: trunk/jsf/docs/userguide/en/modules/preferences.xml =================================================================== --- trunk/jsf/docs/userguide/en/modules/preferences.xml 2009-05-25 12:12:41 UTC (rev 15487) +++ trunk/jsf/docs/userguide/en/modules/preferences.xml 2009-05-25 12:13:47 UTC (rev 15488) @@ -1113,18 +1113,6 @@ </mediaobject> </figure> - <para>On the whole, this document should guide you to those parts of <property>JBoss - Tools</property> which you specifically need to develop Web Applications. It covers - different aspects of visual components such as editors, views, etc. for browsing, - representing and editing web resources you are working with.</para> - - <para>If there's anything we didn't cover or you can't figure - out, please feel free to visit our <ulink - url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=258" - >JBoss Developer Studio Users Forum</ulink> or <ulink - url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201" - >JBoss Tools Users Forum</ulink> to ask questions. There we are also looking for - your suggestions and comments.</para> </section> <!--section id="XDocletTemplates">

15 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2009