JBoss Tools SVN: r34451 - trunk/jbpm/features/org.jbpm.gd.jpdl.feature.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-31 15:17:15 -0400 (Wed, 31 Aug 2011)
New Revision: 34451
Modified:
trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml
Log:
bump up micro version
Modified: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml 2011-08-31 19:16:35 UTC (rev 34450)
+++ trunk/jbpm/features/org.jbpm.gd.jpdl.feature/feature.xml 2011-08-31 19:17:15 UTC (rev 34451)
@@ -2,7 +2,7 @@
<feature
id="org.jbpm.gd.jpdl.feature"
label="%featureName"
- version="3.2.0.qualifier"
+ version="3.2.1.qualifier"
provider-name="%featureProvider">
<description>
@@ -15,7 +15,7 @@
<license url="%licenseURL">
%license
-</license>
+ </license>
<plugin
id="org.jbpm.gd.jpdl"
12 years, 8 months
JBoss Tools SVN: r34450 - trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-31 15:16:35 -0400 (Wed, 31 Aug 2011)
New Revision: 34450
Modified:
trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF
Log:
bump up micro version
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF 2011-08-31 19:15:38 UTC (rev 34449)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/META-INF/MANIFEST.MF 2011-08-31 19:16:35 UTC (rev 34450)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.jbpm.gd.jpdl;singleton:=true
-Bundle-Version: 3.4.0.qualifier
+Bundle-Version: 3.4.1.qualifier
Bundle-ClassPath: .,
lib/dom4j-1.4.jar
Bundle-Activator: org.jbpm.gd.jpdl.Plugin
12 years, 8 months
JBoss Tools SVN: r34449 - in trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl: xml and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-31 15:15:38 -0400 (Wed, 31 Aug 2011)
New Revision: 34449
Modified:
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/notation/JpdlNodeContainer.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java
Log:
- JBIDE-3727: editing names of nodes in source view is working
- changing name of superstate does not result in incoming transitions to go fubar anymore
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/notation/JpdlNodeContainer.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/notation/JpdlNodeContainer.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/notation/JpdlNodeContainer.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -2,6 +2,7 @@
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
+import java.util.List;
import java.util.StringTokenizer;
import org.jbpm.gd.common.editor.CreationFactory;
@@ -19,7 +20,10 @@
public void propertyChange(PropertyChangeEvent evt) {
String eventName = evt.getPropertyName();
- if (eventName.equals("nodeElementAdd")) {
+ if (eventName.equals("name")) {
+ firePropertyChange(evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
+ updateArrivingEdges((String)evt.getNewValue());
+ } else if (eventName.equals("nodeElementAdd")) {
SemanticElement jpdlElement = (SemanticElement)evt.getNewValue();
NotationElement notationElement = getRegisteredNotationElementFor(jpdlElement);
if (notationElement == null) {
@@ -114,4 +118,15 @@
}
danglingEdges.removeAll(list);
}
+
+ private void updateArrivingEdges(String to) {
+ List edges = getArrivingEdges();
+ for (int i = 0; i < edges.size(); i++) {
+ Edge edge = (Edge)edges.get(i);
+ ((SemanticElement)edge.getSemanticElement()).removePropertyChangeListener(edge);
+ ((Transition)edge.getSemanticElement()).setTo(to);
+ ((SemanticElement)edge.getSemanticElement()).addPropertyChangeListener(edge);
+ }
+ }
+
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.swt.widgets.Display;
import org.jbpm.gd.common.model.SemanticElement;
import org.jbpm.gd.common.xml.XmlAdapter;
import org.jbpm.gd.jpdl.model.Decision;
@@ -95,10 +96,15 @@
}
}
- protected void doModelUpdate(String name, String newValue) {
- Decision decision = (Decision)getSemanticElement();
+ protected void doModelUpdate(String name, final String newValue) {
+ final Decision decision = (Decision)getSemanticElement();
if ("name".equals(name)) {
- decision.setName(newValue);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ decision.setName(newValue);
+ }
+ });
} else if ("async".equals(name)) {
decision.setAsync(newValue);
} else if ("expression".equals(name)) {
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.swt.widgets.Display;
import org.jbpm.gd.common.model.SemanticElement;
import org.jbpm.gd.common.xml.XmlAdapter;
import org.jbpm.gd.jpdl.model.Description;
@@ -64,10 +65,15 @@
}
}
- protected void doModelUpdate(String name, String newValue) {
- EndState endState = (EndState)getSemanticElement();
+ protected void doModelUpdate(String name, final String newValue) {
+ final EndState endState = (EndState)getSemanticElement();
if ("name".equals(name)) {
- endState.setName(newValue);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ endState.setName(newValue);
+ }
+ });
}
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.swt.widgets.Display;
import org.jbpm.gd.common.model.SemanticElement;
import org.jbpm.gd.common.xml.XmlAdapter;
import org.jbpm.gd.jpdl.model.Description;
@@ -98,10 +99,15 @@
}
}
- protected void doModelUpdate(String name, String newValue) {
- Fork fork = (Fork)getSemanticElement();
+ protected void doModelUpdate(String name, final String newValue) {
+ final Fork fork = (Fork)getSemanticElement();
if ("name".equals(name)) {
- fork.setName(newValue);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ fork.setName(newValue);
+ }
+ });
} else if ("async".equals(name)) {
fork.setAsync(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.swt.widgets.Display;
import org.jbpm.gd.common.model.SemanticElement;
import org.jbpm.gd.common.xml.XmlAdapter;
import org.jbpm.gd.jpdl.model.Description;
@@ -90,10 +91,15 @@
}
}
- protected void doModelUpdate(String name, String newValue) {
- Join join = (Join)getSemanticElement();
+ protected void doModelUpdate(String name, final String newValue) {
+ final Join join = (Join)getSemanticElement();
if ("name".equals(name)) {
- join.setName(newValue);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ join.setName(newValue);
+ }
+ });
} else if ("async".equals(name)) {
join.setAsync(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.swt.widgets.Display;
import org.jbpm.gd.common.model.SemanticElement;
import org.jbpm.gd.common.xml.XmlAdapter;
import org.jbpm.gd.jpdl.model.Description;
@@ -117,10 +118,15 @@
}
}
- protected void doModelUpdate(String name, String newValue) {
- MailNode mailNode = (MailNode)getSemanticElement();
+ protected void doModelUpdate(String name, final String newValue) {
+ final MailNode mailNode = (MailNode)getSemanticElement();
if ("name".equals(name)) {
- mailNode.setName(newValue);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ mailNode.setName(newValue);
+ }
+ });
} else if ("async".equals(name)) {
mailNode.setAsync(newValue);
} else if ("to".equals(name)) {
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.swt.widgets.Display;
import org.jbpm.gd.common.model.SemanticElement;
import org.jbpm.gd.common.xml.XmlAdapter;
import org.jbpm.gd.jpdl.model.Action;
@@ -116,10 +117,15 @@
}
}
- protected void doModelUpdate(String name, String newValue) {
- Node node = (Node)getSemanticElement();
+ protected void doModelUpdate(String name, final String newValue) {
+ final Node node = (Node)getSemanticElement();
if ("name".equals(name)) {
- node.setName(newValue);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ node.setName(newValue);
+ }
+ });
} else if ("async".equals(name)) {
node.setAsync(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.swt.widgets.Display;
import org.jbpm.gd.common.model.SemanticElement;
import org.jbpm.gd.common.xml.XmlAdapter;
import org.jbpm.gd.jpdl.model.Description;
@@ -103,10 +104,15 @@
}
}
- protected void doModelUpdate(String name, String newValue) {
- ProcessState processState = (ProcessState)getSemanticElement();
+ protected void doModelUpdate(String name, final String newValue) {
+ final ProcessState processState = (ProcessState)getSemanticElement();
if ("name".equals(name)) {
- processState.setName(newValue);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ processState.setName(newValue);
+ }
+ });
} else if ("async".equals(name)) {
processState.setAsync(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.swt.widgets.Display;
import org.jbpm.gd.common.model.SemanticElement;
import org.jbpm.gd.common.xml.XmlAdapter;
import org.jbpm.gd.jpdl.model.Description;
@@ -79,10 +80,15 @@
}
}
- protected void doModelUpdate(String name, String newValue) {
- StartState startState = (StartState)getSemanticElement();
+ protected void doModelUpdate(String name, final String newValue) {
+ final StartState startState = (StartState)getSemanticElement();
if ("name".equals(name)) {
- startState.setName(newValue);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ startState.setName(newValue);
+ }
+ });
}
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.swt.widgets.Display;
import org.jbpm.gd.common.model.SemanticElement;
import org.jbpm.gd.common.xml.XmlAdapter;
import org.jbpm.gd.jpdl.model.Description;
@@ -91,10 +92,15 @@
}
}
- protected void doModelUpdate(String name, String newValue) {
- State state = (State)getSemanticElement();
- if ("name".equals(name)) {
- state.setName(newValue);
+ protected void doModelUpdate(String name, final String newValue) {
+ final State state = (State)getSemanticElement();
+ if ("name".equals(name)) {
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ state.setName(newValue);
+ }
+ });
} else if ("async".equals(name)) {
state.setAsync(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.swt.widgets.Display;
import org.jbpm.gd.common.model.SemanticElement;
import org.jbpm.gd.common.xml.XmlAdapter;
import org.jbpm.gd.jpdl.model.Decision;
@@ -115,10 +116,15 @@
}
}
- protected void doModelUpdate(String name, String newValue) {
- SuperState superState = (SuperState)getSemanticElement();
+ protected void doModelUpdate(String name, final String newValue) {
+ final SuperState superState = (SuperState)getSemanticElement();
if ("name".equals(name)) {
- superState.setName(newValue);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ superState.setName(newValue);
+ }
+ });
} else if ("async".equals(name)) {
superState.setAsync(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java 2011-08-31 18:56:38 UTC (rev 34448)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java 2011-08-31 19:15:38 UTC (rev 34449)
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.swt.widgets.Display;
import org.jbpm.gd.common.model.SemanticElement;
import org.jbpm.gd.common.xml.XmlAdapter;
import org.jbpm.gd.jpdl.model.Description;
@@ -110,10 +111,15 @@
}
}
- protected void doModelUpdate(String name, String newValue) {
- TaskNode taskNode = (TaskNode)getSemanticElement();
+ protected void doModelUpdate(String name, final String newValue) {
+ final TaskNode taskNode = (TaskNode)getSemanticElement();
if ("name".equals(name)) {
- taskNode.setName(newValue);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ taskNode.setName(newValue);
+ }
+ });
} else if ("async".equals(name)) {
taskNode.setAsync(newValue);
} else if ("signal".equals(name)) {
12 years, 8 months
JBoss Tools SVN: r34448 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-08-31 14:56:38 -0400 (Wed, 31 Aug 2011)
New Revision: 34448
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
Log:
Debug fields are removed.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-31 18:54:41 UTC (rev 34447)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-31 18:56:38 UTC (rev 34448)
@@ -1055,9 +1055,6 @@
}
}
- static long q = 0;
- static long time = 0;
-
void rebuildBeans() {
List<TypeDefinition> typeDefinitions = n.getAllTypeDefinitions();
List<IBean> beans = new ArrayList<IBean>();
12 years, 8 months
JBoss Tools SVN: r34447 - branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-08-31 14:54:41 -0400 (Wed, 31 Aug 2011)
New Revision: 34447
Modified:
branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
Log:
JBIDE-9271
https://issues.jboss.org/browse/JBIDE-9271
Beans for unmodified types reused at update.
Merge to 3.3.0.M3.
Modified: branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-31 18:50:16 UTC (rev 34446)
+++ branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-31 18:54:41 UTC (rev 34447)
@@ -1066,18 +1066,24 @@
if(typeDefinition.isVetoed()) {
continue;
}
- ClassBean bean = null;
- if(typeDefinition.getInterceptorAnnotation() != null || ic.isInterceptor(typeDefinition.getType())) {
- bean = new InterceptorBean();
- } else if(typeDefinition.getDecoratorAnnotation() != null || ic.isDecorator(typeDefinition.getType())) {
- bean = new DecoratorBean();
- } else if(typeDefinition.getStatefulAnnotation() != null || typeDefinition.getStatelessAnnotation() != null || typeDefinition.getSingletonAnnotation() != null) {
- bean = new SessionBean();
+
+ ClassBean bean = (ClassBean)classBeans.get(typeDefinition.getType());
+ if(bean != null && (bean.getDefinition() == typeDefinition)) {
+ //Type definitions are rebuilt when changed, otherwise old bean should be reused.
+ bean.cleanCache();
} else {
- bean = new ClassBean();
+ if(typeDefinition.getInterceptorAnnotation() != null || ic.isInterceptor(typeDefinition.getType())) {
+ bean = new InterceptorBean();
+ } else if(typeDefinition.getDecoratorAnnotation() != null || ic.isDecorator(typeDefinition.getType())) {
+ bean = new DecoratorBean();
+ } else if(typeDefinition.getStatefulAnnotation() != null || typeDefinition.getStatelessAnnotation() != null || typeDefinition.getSingletonAnnotation() != null) {
+ bean = new SessionBean();
+ } else {
+ bean = new ClassBean();
+ }
+ bean.setParent(this);
+ bean.setDefinition(typeDefinition);
}
- bean.setParent(this);
- bean.setDefinition(typeDefinition);
if(typeDefinition.hasBeanConstructor()) {
beans.add(bean);
Modified: branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-08-31 18:50:16 UTC (rev 34446)
+++ branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-08-31 18:54:41 UTC (rev 34447)
@@ -585,4 +585,9 @@
public IMember getSourceMember() {
return getBeanClass();
}
+
+ public void cleanCache() {
+ specializingClassBeans.clear();
+ scope = null;
+ }
}
\ No newline at end of file
12 years, 8 months
JBoss Tools SVN: r34446 - in branches/jbosstools-3.3.0.M3/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-08-31 14:50:16 -0400 (Wed, 31 Aug 2011)
New Revision: 34446
Modified:
branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java
branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java
branches/jbosstools-3.3.0.M3/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java
Log:
JBIDE-9608
https://issues.jboss.org/browse/JBIDE-9608
Prevented multiple invocation of update for dependent cdi projects.
Merge to 3.3.0.M3
Modified: branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
--- branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-08-31 18:42:46 UTC (rev 34445)
+++ branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-08-31 18:50:16 UTC (rev 34446)
@@ -13,9 +13,12 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.ICommand;
@@ -178,7 +181,7 @@
public List<AnnotationDefinition> getAllAnnotations() {
Set<CDICoreNature> ps = getCDIProjects(false);
- if(ps == null || ps.isEmpty()) {
+ if(ps == null || ps.isEmpty() || getCDIProjects(true).contains(this)) {
return getDefinitions().getAllAnnotations();
}
List<AnnotationDefinition> result = new ArrayList<AnnotationDefinition>();
@@ -236,6 +239,35 @@
return usedBy;
}
+ public CDICoreNature[] getAllDependentProjects() {
+ Map<CDICoreNature, Integer> set = new HashMap<CDICoreNature, Integer>();
+ getAllDependentProjects(set, 0);
+ CDICoreNature[] result = set.keySet().toArray(new CDICoreNature[set.size()]);
+ Arrays.sort(result, new D(set));
+ return result;
+ }
+ private void getAllDependentProjects(Map<CDICoreNature, Integer> result, int level) {
+ if(level > 10) return;
+ for (CDICoreNature n:usedBy) {
+ if(!result.containsKey(n) || result.get(n).intValue() < level) {
+ result.put(n, level);
+ n.getAllDependentProjects(result, level + 1);
+ }
+ }
+ }
+ private static class D implements Comparator<CDICoreNature> {
+ Map<CDICoreNature, Integer> set;
+ D(Map<CDICoreNature, Integer> set) {
+ this.set = set;
+ }
+ @Override
+ public int compare(CDICoreNature o1, CDICoreNature o2) {
+ return set.get(o1).intValue() - set.get(o2).intValue();
+ }
+
+ }
+
+
public void addCDIProject(final CDICoreNature p) {
if(dependsOn.contains(p)) return;
addUsedCDIProject(p);
@@ -246,7 +278,7 @@
public void run() {
p.resolve();
if(p.getDelegate() != null) {
- p.getDelegate().update();
+ p.getDelegate().update(true);
}
}
@@ -361,7 +393,7 @@
definitions.clean();
if(cdiProjectDelegate != null) {
- cdiProjectDelegate.update();
+ cdiProjectDelegate.update(true);
}
// IPath[] ps = sourcePaths2.keySet().toArray(new IPath[0]);
// for (int i = 0; i < ps.length; i++) {
Modified: branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java
===================================================================
--- branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java 2011-08-31 18:42:46 UTC (rev 34445)
+++ branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIProject.java 2011-08-31 18:50:16 UTC (rev 34446)
@@ -17,5 +17,5 @@
public CDICoreNature getNature();
public void setNature(CDICoreNature n);
- public void update();
+ public void update(boolean updateDependent);
}
\ No newline at end of file
Modified: branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-31 18:42:46 UTC (rev 34445)
+++ branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-31 18:50:16 UTC (rev 34446)
@@ -973,7 +973,7 @@
return scopesByPath.get(path);
}
- public void update() {
+ public void update(boolean updateDependent) {
rebuildXML();
rebuildAnnotationTypes();
rebuildBeans();
@@ -988,13 +988,15 @@
bp.buildBeans(this);
}
}
-
- CDICoreNature[] ps = n.getDependentProjects().toArray(new CDICoreNature[0]);
- for (CDICoreNature p: ps) {
- if(p.getProject() != null && p.getProject().isAccessible() && p.getDelegate() != null) {
- p.getDelegate().update();
+
+ if(updateDependent) {
+ CDICoreNature[] ps = n.getAllDependentProjects();
+ for (CDICoreNature p: ps) {
+ if(p.getProject() != null && p.getProject().isAccessible() && p.getDelegate() != null) {
+ p.getDelegate().update(false);
+ }
}
- }
+ }
CDICorePlugin.fire(new CDIProjectChangeEvent(this));
}
Modified: branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
===================================================================
--- branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-08-31 18:42:46 UTC (rev 34445)
+++ branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-08-31 18:50:16 UTC (rev 34446)
@@ -380,7 +380,7 @@
//extensions may add to dependencies while they change
dependencies = workingCopy.dependencies;
- project.getDelegate().update();
+ project.getDelegate().update(true);
workingCopy = null;
}
@@ -414,9 +414,15 @@
|| (result.getType().getResource() != null && result.getType().getResource().getProject() != project.getProject())
) {
//3. Look in annotations loaded by used projects
- Set<CDICoreNature> ns = project.getCDIProjects(true);
+ Set<CDICoreNature> ns = project.getCDIProjects(false);
+ Set<CDICoreNature> ns2 = project.getCDIProjects(true);
+ boolean cyclic = ns2.contains(project);
+ if(cyclic) {
+ ns = ns2;
+ }
for (CDICoreNature n: ns) {
- AnnotationDefinition r = n.getDefinitions().getAnnotation(fullyQualifiedName);
+ DefinitionContext d = n.getDefinitions();
+ AnnotationDefinition r = (!cyclic) ? d.getAnnotation(fullyQualifiedName) : d.annotations.get(fullyQualifiedName);
if(r != null) {
result = r;
//4. Store result for the case if used project is cleaned.
Modified: branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java
===================================================================
--- branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java 2011-08-31 18:42:46 UTC (rev 34445)
+++ branches/jbosstools-3.3.0.M3/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectTree.java 2011-08-31 18:50:16 UTC (rev 34446)
@@ -104,14 +104,14 @@
private Set<CDICoreNature> getRootProjects(CDICoreNature project) {
Set<CDICoreNature> result = new HashSet<CDICoreNature>();
- Set<CDICoreNature> dependentProjects = project.getDependentProjects();
- if(dependentProjects.isEmpty()) {
+ CDICoreNature[] dependentProjects = project.getAllDependentProjects();
+ if(dependentProjects.length == 0) {
result.add(project);
} else {
for (CDICoreNature nature : dependentProjects) {
if(!nature.getProject().isAccessible()) continue;
- if(!result.contains(nature)) {
- result.addAll(getRootProjects(nature));
+ if(nature.getDependentProjects().isEmpty()) {
+ result.add(nature);
}
}
}
Modified: branches/jbosstools-3.3.0.M3/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java
===================================================================
--- branches/jbosstools-3.3.0.M3/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java 2011-08-31 18:42:46 UTC (rev 34445)
+++ branches/jbosstools-3.3.0.M3/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIProject.java 2011-08-31 18:50:16 UTC (rev 34446)
@@ -297,7 +297,7 @@
}
@Override
- public void update() {
+ public void update(boolean updateDependent) {
}
-}
+}
\ No newline at end of file
12 years, 8 months
JBoss Tools SVN: r34445 - in trunk/documentation/whatsnew/teiid: images and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: blafond
Date: 2011-08-31 14:42:46 -0400 (Wed, 31 Aug 2011)
New Revision: 34445
Added:
trunk/documentation/whatsnew/teiid/images/create-source-function-dialog.png
trunk/documentation/whatsnew/teiid/images/generated-flat-file-diagram.png
trunk/documentation/whatsnew/teiid/images/generated-flat-file-view-table.png
trunk/documentation/whatsnew/teiid/images/genwarwithmtom.png
trunk/documentation/whatsnew/teiid/images/preview-data-decorators.png
trunk/documentation/whatsnew/teiid/images/show-sql-reserved-words-action.png
trunk/documentation/whatsnew/teiid/images/source-function.png
trunk/documentation/whatsnew/teiid/images/sql-reserved-words-view.png
trunk/documentation/whatsnew/teiid/images/teiid-designer-import-options.png
trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-configure.png
trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-page-1.png
trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-page-2.png
trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-parse-column.png
trunk/documentation/whatsnew/teiid/teiid-news-7.5.html
Log:
JBIDE-9626 Added what's new content from 7.5 community release
Added: trunk/documentation/whatsnew/teiid/images/create-source-function-dialog.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/create-source-function-dialog.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/generated-flat-file-diagram.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/generated-flat-file-diagram.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/generated-flat-file-view-table.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/generated-flat-file-view-table.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/genwarwithmtom.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/genwarwithmtom.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/preview-data-decorators.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/preview-data-decorators.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/show-sql-reserved-words-action.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/show-sql-reserved-words-action.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/source-function.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/source-function.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/sql-reserved-words-view.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/sql-reserved-words-view.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/teiid-designer-import-options.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/teiid-designer-import-options.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-configure.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-configure.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-page-1.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-page-1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-page-2.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-page-2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-parse-column.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/teiid/images/teiid-metadata-file-import-parse-column.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/teiid/teiid-news-7.5.html
===================================================================
--- trunk/documentation/whatsnew/teiid/teiid-news-7.5.html (rev 0)
+++ trunk/documentation/whatsnew/teiid/teiid-news-7.5.html 2011-08-31 18:42:46 UTC (rev 34445)
@@ -0,0 +1,243 @@
+<!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">
+<head>
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type"
+ content="text/html; charset=ISO-8859-1">
+ <link rel="stylesheet" href="../whatsnew.css">
+ <title>Teiid Designer What's New</title>
+ <script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+ </script>
+</head>
+<body>
+<h1>Teiid Designer 7.5 What's New</h1>
+<p align="right"><a href="../index.html">< Main Index</a></p>
+<p>Last revised August 31, 2011</p>
+<p><b>Teiid Designer</b> is a graphical data modeling tool that enables
+rapid definition, integration, management and testing of data services
+without programming using the <b>Teiid</b> runtime engine.</p>
+<p>For more details on <a href="http://www.jboss.org/teiid.html">Teiid</a>
+and <a href="http://www.jboss.org/teiiddesigner.html">Teiid Designer</a>
+visit: <a href="http://www.teiid.org">http://www.teiid.org</a></p>
+<table width="80%" border="0" cellpadding="10" cellspacing="0">
+ <tbody>
+ <tr>
+ <td colspan="2">
+ <hr>
+ <h3><span style="font-size: 12pt;"><strong>Relational Model
+Source Functions</strong></span></h3>
+ <hr> </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Create Source Function<b> </b></b></p>
+ <b> </b></td>
+ <td valign="top">
+ <p> To improve ability to utilize database functions within View
+transformations, a new "<strong>New Child > Source Function</strong>"
+
+action
+and
+wizard was added to assist in building a source procedure
+that conforms to a function structure, including input and output
+parameters. Prior to Teiid Designer 7.5, these functions were required
+to be modeled as User Defined functions.. (TEIIDDES-992)</p>
+ <p>To create a new Source Function, select a Relational Source
+Model in your workspace and select "<strong>New Child > Source
+Function</strong>". Enter your database function name, define input
+parameters including datatype and length, specify output parameter
+info, set options and click OK.</p>
+ <p>The resulting source function will be added to your model and
+will be represented by the <a
+ href="http://community.jboss.org/servlet/JiveServlet/showImage/102-17147-4-1687..."><img
+ alt="source-function.png" class="jive-image"
+ src="images/source-function.png"
+ style="border: 0px solid ; width: 16px; height: 16px;"></a> icon.</p>
+ <p><img style="border: 1px solid ; width: 449px; height: 551px;"
+ src="images/create-source-function-dialog.png"
+ alt="Create Source Function Dialog"><br>
+ </p>
+ <p><br>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr>
+ <h3>New Flat File Import Wizard View</h3>
+ <hr> </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b> <br>
+ </b></p>
+ </td>
+ <td valign="top">
+ <p>Teiid supports Flat Files as data sources. In release
+7.5, Teiid Designer introduces a new Import wizard designed to assist
+in creating the metadata models required to access the data in your
+flat files. As with Designer's JDBC, Salesforce and WSDL importers, the
+Flat File importer is based on utilizing a specific Data Tools
+Connection Profile. (TEIIDDES-1017)<br>
+ </p>
+ <p>The results of the importer will include a source model
+containing the three Flat File procedures supported by Teiid. Namely:</p>
+ <ul>
+ <li style="text-align: start;">getFiles()</li>
+ <li style="text-align: start;">getTextFiles()</li>
+ <li style="text-align: start;">saveFile()</li>
+ </ul>
+ <p>The importer will also create a new view model containing a
+view table for each of your selected flat file source files. Within
+these view tables will be generated SQL transformations containing the
+"getTextFiles()" procedure from your source model as well as the column
+definitions and parameters required for the Teiid TEXTTABLE() function
+used to query the data file. You can also choose to update an existing
+view model instead of creating a new view model.</p>
+ <p>The TEXTTABLE function, as defined in the Teiid documentation,
+processes character input to produce tabular ouptut. It supports both
+fixed and delimited file format parsing. The function itself defines
+what columns it projects. The TEXTTABLE function is implicitly a nested
+table and may be correlated to preceeding FROM clause entries.</p>
+ <p>TEXTTABLE(expression COLUMNS <COLUMN>, ... <span
+ class="error">[DELIMITER char]</span> <span class="error">[(QUOTE|ESCAPE)
+char]</span> [HEADER <span class="error">[integer]</span>] <span
+ class="error">[SKIP integer]</span>) AS name</p>
+ <p>Teiid Designer will construct the full SQL statement for each
+view table in the form:</p>
+ <p><strong>SELECT</strong></p>
+ <p><strong> A.Name,
+A.Sport, A.Position, A.Team, A.City, A.StateCode, A.AnnualSalary</strong></p>
+ <p><strong> FROM</strong></p>
+ <p><strong> (EXEC
+PlayerDataSource.getTextFiles('PlayerData.txt')) AS f, TEXTTABLE(f.file
+COLUMNS Name string, Sport string, Position string, Team string, City
+string, StateCode string, AnnualSalary string HEADER 2 SKIP 3) AS A</strong></p>
+ <p>The import option is labeled "<strong>Flat File Source
+>> Source and View Model</strong>" and is show below in the
+Import wizard's first page under the Teiid Designer category. <em>Note
+
+also
+that Designer's import labels have changed to reflect both a
+source (i.e. JDBC Database) and one or more target metamodels that will
+be created or updated during the import process.</em><br>
+ </p>
+ <p><img style="border: 1px solid ; width: 449px; height: 452px;"
+ src="images/teiid-designer-import-options.png" alt="Import Options"><br>
+ </p>
+ <p>The first page of the wizard requires selection of an existing
+Flat File Source connection profile in order to locate the designer
+source file folder. Once selected (or created view "New..." button) the
+available data files will be displayed in the table.</p>
+ <p>Check each data file you wish to process. Each file will be
+used to construct a view table containing the required SQL
+transformation for retrieving your data and returning a result set.</p>
+ <p><img style="border: 1px solid ; width: 449px; height: 451px;"
+ src="images/teiid-metadata-file-import-page-1.png"
+ alt="Source Selection"><br>
+ </p>
+ <p>The first page of the wizard requires selection of an existing
+Flat File Source connection profile in order to locate the designer
+source file folder. Once selected (or created view "New..." button) the
+available data files will be displayed in the table.</p>
+ <p>Check each data file you wish to process. Each file will be
+used to construct a view table containing the required SQL
+transformation for retrieving your data and returning a result set.</p>
+ <p><img style="border: 1px solid ; width: 450px; height: 515px;"
+ src="images/teiid-metadata-file-import-configure.png"
+ alt="Parser Settings Dialog"><br>
+ </p>
+ <p>At any time you can select a data row in your <strong>File
+Contents Preview</strong> section and click the "<strong>Parse Selected
+Row</strong>" button. A dialog will be displayed showing the list of
+columns and the resulting column data. If your column data is not what
+you expected, you'll need to adjust your settings accordingly.<br>
+ </p>
+ <p><img style="width: 445px; height: 467px;"
+ alt="Parsed Column Data Dialog"
+ src="images/teiid-metadata-file-import-parse-column.png"><br>
+ </p>
+ <p>The last page of the wizard, the <strong>Target Models
+Definition</strong> page, contains two model definition sections. Both
+sections allow you to select a workspace location to place the
+generated model. In the case of the <strong>View Model Definition</strong>,
+you
+can select an existing view model via the "..." browse button and
+the "<strong>Update Existing Model</strong>" checkbox will be selected.<br>
+ </p>
+ <p><img style="width: 449px; height: 478px;"
+ alt="Target Models Definition"
+ src="images/teiid-metadata-file-import-page-2.png"><br>
+ </p>
+ <p>This import operation will result in the generated source
+model shown below...<br>
+ </p>
+ <p><img style="width: 449px; height: 268px;"
+ alt="Flat File Source Procedures"
+ src="images/generated-flat-file-diagram.png"><br>
+ </p>
+ <p>... and generated view tables containing the completed SQL
+required to access the data in your flat file using the "getFiles"
+procedure above and the Teiid TEXTTABLE() function.<br>
+ </p>
+ <h3>Connection Management</h3>
+ <p><img style="width: 449px; height: 355px;"
+ alt="Generated Flat File View Table"
+ src="images/generated-flat-file-view-table.png"><br>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr>
+ <h3>Teiid SQL Grammar Reserved Words View<br>
+ </h3>
+ <hr> </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>SQL Reserved Words View<b> </b></b></p>
+ <b> </b></td>
+ <td valign="top">Teiid supports a subset of various SQL reserved
+words. A full list of the supported reserved words is now available in
+a new SQL Reserverd Words view. You can open this view via "<strong>Preferences
+>
+Other ... > Teiid Designer > SQ Reserved Words</strong>" or
+select the "<strong>Metadata > Show SQL Reserved Words</strong>"
+action in the main toolbar shown below. (TEIIDDES-958)
+ <p><img style="border: 1px solid ; width: 331px; height: 227px;"
+ src="images/show-sql-reserved-words-action.png"
+ alt="Show SQL Reserved Words Action"><img style="border: 1px solid ;"
+ src="images/view-connection-info-dialog.png.png"
+ alt="View Connection Info Dialog"><br>
+ </p>
+ <p><img style="width: 449px; height: 200px;"
+ alt="SQL Reserved Words View" src="images/sql-reserved-words-view.png"><br>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><br>
+ </td>
+ <td valign="top"><br>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr></td>
+ </tr>
+ </tbody>
+</table>
+</body>
+</html>
Property changes on: trunk/documentation/whatsnew/teiid/teiid-news-7.5.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 8 months
JBoss Tools SVN: r34444 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2011-08-31 14:29:43 -0400 (Wed, 31 Aug 2011)
New Revision: 34444
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
Log:
JBIDE-9271
https://issues.jboss.org/browse/JBIDE-9271
Prevented multiple invocation of update for dependent cdi projects.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-31 18:23:28 UTC (rev 34443)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-08-31 18:29:43 UTC (rev 34444)
@@ -1054,6 +1054,9 @@
s.setSourcePath(r);
}
}
+
+ static long q = 0;
+ static long time = 0;
void rebuildBeans() {
List<TypeDefinition> typeDefinitions = n.getAllTypeDefinitions();
@@ -1066,18 +1069,24 @@
if(typeDefinition.isVetoed()) {
continue;
}
- ClassBean bean = null;
- if(typeDefinition.getInterceptorAnnotation() != null || ic.isInterceptor(typeDefinition.getType())) {
- bean = new InterceptorBean();
- } else if(typeDefinition.getDecoratorAnnotation() != null || ic.isDecorator(typeDefinition.getType())) {
- bean = new DecoratorBean();
- } else if(typeDefinition.getStatefulAnnotation() != null || typeDefinition.getStatelessAnnotation() != null || typeDefinition.getSingletonAnnotation() != null) {
- bean = new SessionBean();
+
+ ClassBean bean = (ClassBean)classBeans.get(typeDefinition.getType());
+ if(bean != null && (bean.getDefinition() == typeDefinition)) {
+ //Type definitions are rebuilt when changed, otherwise old bean should be reused.
+ bean.cleanCache();
} else {
- bean = new ClassBean();
+ if(typeDefinition.getInterceptorAnnotation() != null || ic.isInterceptor(typeDefinition.getType())) {
+ bean = new InterceptorBean();
+ } else if(typeDefinition.getDecoratorAnnotation() != null || ic.isDecorator(typeDefinition.getType())) {
+ bean = new DecoratorBean();
+ } else if(typeDefinition.getStatefulAnnotation() != null || typeDefinition.getStatelessAnnotation() != null || typeDefinition.getSingletonAnnotation() != null) {
+ bean = new SessionBean();
+ } else {
+ bean = new ClassBean();
+ }
+ bean.setParent(this);
+ bean.setDefinition(typeDefinition);
}
- bean.setParent(this);
- bean.setDefinition(typeDefinition);
if(typeDefinition.hasBeanConstructor()) {
beans.add(bean);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-08-31 18:23:28 UTC (rev 34443)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-08-31 18:29:43 UTC (rev 34444)
@@ -585,4 +585,9 @@
public IMember getSourceMember() {
return getBeanClass();
}
+
+ public void cleanCache() {
+ specializingClassBeans.clear();
+ scope = null;
+ }
}
\ No newline at end of file
12 years, 8 months
JBoss Tools SVN: r34442 - in branches/jbosstools-3.3.0.M3/build: target-platform and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-08-31 13:46:57 -0400 (Wed, 31 Aug 2011)
New Revision: 34442
Modified:
branches/jbosstools-3.3.0.M3/build/parent/pom.xml
branches/jbosstools-3.3.0.M3/build/target-platform/multiple.target
branches/jbosstools-3.3.0.M3/build/target-platform/multiple.target.p2mirror.xml
Log:
point 33x branch at staging/_composite_/3.3.indigo instead of staging/_composite_/trunk
Modified: branches/jbosstools-3.3.0.M3/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/build/parent/pom.xml 2011-08-31 17:35:29 UTC (rev 34441)
+++ branches/jbosstools-3.3.0.M3/build/parent/pom.xml 2011-08-31 17:46:57 UTC (rev 34442)
@@ -39,11 +39,11 @@
<!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</jbosstools-nightly-staging-composite>
+ <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</jbosstools-nightly-staging-composite>
<!-- 2b. or use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/trunk/</local.composite>
+ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
<!-- 3a. URL of latest JBT requirements composite mirror -->
<jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/SR0/</jboss-requirements-composite-mirror>
Modified: branches/jbosstools-3.3.0.M3/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.3.0.M3/build/target-platform/multiple.target 2011-08-31 17:35:29 UTC (rev 34441)
+++ branches/jbosstools-3.3.0.M3/build/target-platform/multiple.target 2011-08-31 17:46:57 UTC (rev 34442)
@@ -9,7 +9,7 @@
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
+ <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
Modified: branches/jbosstools-3.3.0.M3/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.3.0.M3/build/target-platform/multiple.target.p2mirror.xml 2011-08-31 17:35:29 UTC (rev 34441)
+++ branches/jbosstools-3.3.0.M3/build/target-platform/multiple.target.p2mirror.xml 2011-08-31 17:46:57 UTC (rev 34442)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
+<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR0/"/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
12 years, 8 months