Author: DartPeng
Date: 2008-09-22 06:47:14 -0400 (Mon, 22 Sep 2008)
New Revision: 10388
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AnalyzerFactory.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/GraphRootModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
Log:
change the extension points information store way
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AnalyzerFactory.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AnalyzerFactory.java 2008-09-22
10:42:07 UTC (rev 10387)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AnalyzerFactory.java 2008-09-22
10:47:14 UTC (rev 10388)
@@ -44,7 +44,8 @@
DataTypeID ti = new DataTypeID();
ti.setId(id);
ModelAnalyzer analyzer = ((ModelAnalyzer) map.get(id));
- if(analyzer == null) continue;
+ if (analyzer == null)
+ continue;
ti.setName(analyzer.getName());
list.add(ti);
}
@@ -79,13 +80,15 @@
if (map == null)
return;
IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint ep =
registry.getExtensionPoint(SmooksExtensionPointConstants.EXTENTION_POINT_ANALYZER);
+ IExtensionPoint ep = registry
+ .getExtensionPoint(SmooksExtensionPointConstants.EXTENTION_POINT_ANALYZER);
if (ep == null)
return;
IConfigurationElement[] elements = ep.getConfigurationElements();
for (int i = 0; i < elements.length; i++) {
IConfigurationElement element = elements[i];
- if(!element.getName().equals(elementName)) continue;
+ if (!element.getName().equals(elementName))
+ continue;
String aname = element
.getAttribute(SmooksExtensionPointConstants.EXTENTION_POINT_ATTRIBUTE_NAME);
String clazz = element
@@ -127,9 +130,13 @@
return;
IConfigurationElement[] elements = ep.getConfigurationElements();
for (int i = 0; i < elements.length; i++) {
-
+
IConfigurationElement element = elements[i];
- if(!element.getName().equals(SmooksExtensionPointConstants.EXTENTION_POINT_ELEMENT_MAPPINGANALYZER))
continue;
+ if (!element
+ .getName()
+ .equals(
+ SmooksExtensionPointConstants.EXTENTION_POINT_ELEMENT_MAPPINGANALYZER))
+ continue;
String aname = element
.getAttribute(SmooksExtensionPointConstants.EXTENTION_POINT_ATTRIBUTE_NAME);
String clazz = element
@@ -141,10 +148,10 @@
if (clazz == null || "".equals(clazz))
continue;
- MappingAnalyzerMapper mapper = new MappingAnalyzerMapper();
- mapper.setElement(element);
- mapper.setAnalyzerName(aname);
- mapper.setSourceDataTypeID(typeID);
+ // MappingAnalyzerMapper mapper = mappingAnalyzerMap.get
+ // mapper.setElement(element);
+ // mapper.setAnalyzerName(aname);
+ // mapper.setSourceDataTypeID(typeID);
IConfigurationElement[] childrenElements = element.getChildren();
for (int j = 0; j < childrenElements.length; j++) {
@@ -157,10 +164,14 @@
.getAttribute(SmooksExtensionPointConstants.EXTENTION_POINT_ATTRIBUTE_ID);
if (tid == null || "".equals(tid))
continue;
+ MappingAnalyzerMapper mapper = new MappingAnalyzerMapper();
+ mapper.setElement(element);
+ mapper.setAnalyzerName(aname);
+ mapper.setSourceDataTypeID(typeID);
+ mappingAnalyzerMap.put(typeID + ":" + tid, mapper);
mapper.addTargetDataTypeID(tid);
}
}
- mappingAnalyzerMap.put(typeID, mapper);
}
}
@@ -178,7 +189,7 @@
String targetDataTypeID) throws CoreException {
if (this.mappingAnalyzerMap != null) {
MappingAnalyzerMapper mapper = (MappingAnalyzerMapper) this.mappingAnalyzerMap
- .get(sourceDataTypeID);
+ .get(sourceDataTypeID + ":" + targetDataTypeID);
if (mapper == null)
return null;
if (mapper.canTransformToTheTarget(targetDataTypeID)) {
@@ -193,7 +204,8 @@
if (this.sourceModelAnalyzer != null) {
ModelAnalyzer mapper = (ModelAnalyzer) this.sourceModelAnalyzer
.get(datatypeID);
- if(mapper == null) return null;
+ if (mapper == null)
+ return null;
return (ISourceModelAnalyzer) createModelAnalyzer(mapper);
}
return null;
@@ -204,7 +216,8 @@
if (this.targetModelAnalyzer != null) {
ModelAnalyzer mapper = (ModelAnalyzer) this.targetModelAnalyzer
.get(datatypeID);
- if(mapper == null) return null;
+ if (mapper == null)
+ return null;
return (ITargetModelAnalyzer) createModelAnalyzer(mapper);
}
return null;
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataModel.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataModel.java 2008-09-22
10:42:07 UTC (rev 10387)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataModel.java 2008-09-22
10:47:14 UTC (rev 10388)
@@ -144,7 +144,7 @@
/**
* ����Ԫ�ض����Ӵ�
*/
- private List children = new ArrayList();
+ protected List children = new ArrayList();
private AbstractStructuredDataModel parent = null;
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/GraphRootModel.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/GraphRootModel.java 2008-09-22
10:42:07 UTC (rev 10387)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/GraphRootModel.java 2008-09-22
10:47:14 UTC (rev 10388)
@@ -10,10 +10,40 @@
******************************************************************************/
package org.jboss.tools.smooks.ui.gef.model;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
* @author Dart Peng
* @Date Jul 30, 2008
*/
public class GraphRootModel extends AbstractStructuredDataModel {
+ private List<SourceModel> sourceModelList = new ArrayList<SourceModel>();
+ private List<TargetModel> targetModelList = new ArrayList<TargetModel>();
+
+ public List<SourceModel> loadSourceModelList() {
+ sourceModelList.clear();
+ for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ Object obj = (Object) iterator.next();
+ if(obj.getClass() == SourceModel.class){
+ sourceModelList.add((SourceModel)obj);
+ }
+ }
+ return sourceModelList;
+ }
+
+
+ public List<TargetModel> loadTargetModelList() {
+ targetModelList.clear();
+ for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ Object obj = (Object) iterator.next();
+ if(obj.getClass() == TargetModel.class){
+ targetModelList.add((TargetModel)obj);
+ }
+ }
+ return targetModelList;
+ }
+
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-09-22
10:42:07 UTC (rev 10387)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-09-22
10:47:14 UTC (rev 10388)
@@ -79,6 +79,7 @@
public static LineConnectionModel getFirstSourceModelViaConnection(
AbstractStructuredDataModel target) {
+ if(target == null) return null;
if (target instanceof IConnectableModel) {
List list = ((IConnectableModel) target)
.getModelSourceConnections();
@@ -91,9 +92,10 @@
}
public static LineConnectionModel getFirstTargetModelViaConnection(
- AbstractStructuredDataModel target) {
- if (target instanceof IConnectableModel) {
- List list = ((IConnectableModel) target)
+ AbstractStructuredDataModel source) {
+ if(source == null) return null;
+ if (source instanceof IConnectableModel) {
+ List list = ((IConnectableModel) source)
.getModelTargetConnections();
if (list.isEmpty())
return null;
Show replies by date