JBoss Tools SVN: r3132 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-08-14 16:38:13 -0400 (Tue, 14 Aug 2007)
New Revision: 3132
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java
Log:
code adjustment
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2007-08-14 16:44:08 UTC (rev 3131)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2007-08-14 20:38:13 UTC (rev 3132)
@@ -342,7 +342,7 @@
nsIDOMMouseEvent mouseEvent;
mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
- getEditorDomEventListener().mouseClick(mouseEvent);
+ getEditorDomEventListener().mouseMove(mouseEvent);
} else if(MOUSEDOWNEVENTTYPE.equals(domEvent.getType())) {
nsIDOMMouseEvent mouseEvent;
@@ -357,7 +357,7 @@
nsIDOMMouseEvent mouseEvent;
mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
- getEditorDomEventListener().mouseUp(mouseEvent);
+ getEditorDomEventListener().mouseClick(mouseEvent);
} else if(DBLCLICK.equals(domEvent.getType())) {
nsIDOMMouseEvent mouseEvent;
18 years, 4 months
JBoss Tools SVN: r3130 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-08-14 12:13:04 -0400 (Tue, 14 Aug 2007)
New Revision: 3130
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java
Log:
http://jira.jboss.com/jira/browse/EXIN-427
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2007-08-14 16:10:00 UTC (rev 3129)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmLabelProvider.java 2007-08-14 16:13:04 UTC (rev 3130)
@@ -24,6 +24,7 @@
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
+import org.hibernate.mapping.Any;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Component;
import org.hibernate.mapping.DependantValue;
@@ -67,10 +68,11 @@
descriptor = (ImageDescriptor)ormModelImageVisitor.visitManyToOneMapping((ManyToOne) element);
} else if (element instanceof OneToMany) {
descriptor = (ImageDescriptor)ormModelImageVisitor.visitOneToManyMapping((OneToMany) element);
+ } else if (element instanceof Any) {
+ descriptor = (ImageDescriptor)ormModelImageVisitor.visitAnyMapping((Any) element);
} else if (element instanceof SimpleValue) {
descriptor = (ImageDescriptor)ormModelImageVisitor.visitSimpleValueMapping((SimpleValue) element);
} else {
- //throw unknownElement(element);
return null;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-14 16:10:00 UTC (rev 3129)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelImageVisitor.java 2007-08-14 16:13:04 UTC (rev 3130)
@@ -12,6 +12,7 @@
import java.util.ResourceBundle;
+import org.hibernate.mapping.Any;
import org.hibernate.mapping.Array;
import org.hibernate.mapping.Bag;
import org.hibernate.mapping.Column;
@@ -23,6 +24,7 @@
import org.hibernate.mapping.ManyToOne;
import org.hibernate.mapping.Map;
import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
import org.hibernate.mapping.PersistentClassVisitor;
import org.hibernate.mapping.PrimitiveArray;
import org.hibernate.mapping.Property;
@@ -35,96 +37,154 @@
import org.hibernate.mapping.UnionSubclass;
import org.jboss.tools.hibernate.ui.view.ViewPlugin;
-
-
/**
* @author Tau
- *
+ *
*/
-public class OrmModelImageVisitor implements /*IOrmModelVisitor, IHibernateMappingVisitor,*/ PersistentClassVisitor {
-
+public class OrmModelImageVisitor implements
+ /* IOrmModelVisitor, IHibernateMappingVisitor, */PersistentClassVisitor {
+
private ResourceBundle BUNDLE = ViewPlugin.BUNDLE_IMAGE;
-
+
public Object visitDatabaseTable(Table table) {
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseTable")); //$NON-NLS-1$
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.DatabaseTable")); //$NON-NLS-1$
}
public Object visitDatabaseColumn(Column column) {
- if(column.isUnique()) {
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseUniqueKeyColumn"));
- }else if (HibernateUtils.isPrimaryKey(column)&& HibernateUtils.getTable(column) != null && HibernateUtils.isForeignKey(column)){
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabasePrimaryForeignKeysColumn"));
- } else if (HibernateUtils.isPrimaryKey(column)){
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabasePrimaryKeyColumn")); //$NON-NLS-1$
- } else if (HibernateUtils.getTable(column) != null && HibernateUtils.isForeignKey(column)){
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseForeignKeyColumn")); //$NON-NLS-1$
- } else return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseColumn")); //$NON-NLS-1$
+ if (column.isUnique()) {
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.DatabaseUniqueKeyColumn"));
+ } else if (HibernateUtils.isPrimaryKey(column)
+ && HibernateUtils.getTable(column) != null
+ && HibernateUtils.isForeignKey(column)) {
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.DatabasePrimaryForeignKeysColumn"));
+ } else if (HibernateUtils.isPrimaryKey(column)) {
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.DatabasePrimaryKeyColumn")); //$NON-NLS-1$
+ } else if (HibernateUtils.getTable(column) != null
+ && HibernateUtils.isForeignKey(column)) {
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.DatabaseForeignKeyColumn")); //$NON-NLS-1$
+ } else
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.DatabaseColumn")); //$NON-NLS-1$
}
-
+
public Object visitPersistentField(Property field) {
- if (field !=null){
- if(field.getValue() != null){
- if(field.getValue() instanceof ManyToOne)
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldMany-to-one")); //$NON-NLS-1$
+ if (field != null) {
+ if (field.getPersistentClass().getVersion() == field) {
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldSimple_version"));
}
- if(field.getPersistentClass().getVersion() == field){
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple_version")); //$NON-NLS-1$
+ if (field.getPersistentClass().getIdentifierProperty() == field) {
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldSimple_id"));
}
- if(field.getPersistentClass().getIdentifierProperty() == field){
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple_id")); //$NON-NLS-1$
+ if (field.getValue() != null) {
+ if (field.getValue() instanceof OneToOne)
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldOne-to-one"));
+ else if (field.getValue() instanceof ManyToOne)
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldMany-to-one"));
+ else if (field.getValue() instanceof Any)
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldAny"));
+
+ if (field.getType() != null
+ && field.getType().isCollectionType()) {
+ if (field.getValue() instanceof PrimitiveArray)
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.Collection_primitive_array"));
+ else if (field.getValue() instanceof Array)
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.Collection_array"));
+ else if (field.getValue() instanceof List)
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.Collection_list"));
+ else if (field.getValue() instanceof Set)
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.Collection_set"));
+ else if (field.getValue() instanceof Map)
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.Collection_map"));
+ else if (field.getValue() instanceof Bag)
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.Collection_bag"));
+ else if (field.getValue() instanceof IdentifierBag)
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.Collection_idbag"));
+ else
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.Collection"));
+ }
}
- if (field.getValue() != null && field.getType() != null && field.getType().isCollectionType()) {
- if(field.getValue() instanceof PrimitiveArray)
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_primitive_array"));
- else if(field.getValue() instanceof Array)
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_array"));
- else if(field.getValue() instanceof List)
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_list"));
- else if(field.getValue() instanceof Set)
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_set"));
- else if(field.getValue() instanceof Map)
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_map"));
- else if(field.getValue() instanceof Bag)
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_bag"));
- else if(field.getValue() instanceof IdentifierBag)
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_idbag"));
- else
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection"));
- }
}
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldSimple"));
}
public Object visitManyToOneMapping(ManyToOne field) {
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldMany-to-many")); //$NON-NLS-1$
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldMany-to-many"));
}
public Object visitOneToManyMapping(OneToMany field) {
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldOne-to-many")); //$NON-NLS-1$
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldOne-to-many"));
}
public Object visitSimpleValueMapping(SimpleValue field) {
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldSimple"));
}
+ public Object visitAnyMapping(Any field) {
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldMany-to-any"));
+ }
+
public Object visitComponentMapping(Component mapping) {
- if (mapping != null){
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldComponent")); //$NON-NLS-1$
+ if (mapping != null) {
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldComponent"));
}
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldNot_mapped"));
}
public Object visitComponentKeyMapping(DependantValue mapping) {
- if (mapping.getTable().getIdentifierValue() == mapping){
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldComponent_id")); //$NON-NLS-1$
+ if (mapping.getTable().getIdentifierValue() == mapping) {
+ return ViewPlugin
+ .getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldComponent_id")); //$NON-NLS-1$
}
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$
}
-
public Object accept(RootClass arg0) {
- return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$
+ return ViewPlugin.getImageDescriptor(BUNDLE
+ .getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$
}
public Object accept(UnionSubclass arg0) {
18 years, 4 months
JBoss Tools SVN: r3129 - in trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser: wtp and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-14 12:10:00 -0400 (Tue, 14 Aug 2007)
New Revision: 3129
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
Log:
EXIN-160
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java 2007-08-14 16:07:03 UTC (rev 3128)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/AbstractBrowserContext.java 2007-08-14 16:10:00 UTC (rev 3129)
@@ -33,6 +33,10 @@
public abstract String getModelActionPath();
+ protected boolean inited = false;
+ public void init() {
+ }
+
public void execute(XModelObject object) throws Exception {
setLastRunObject(object);
if(url == null) throw new Exception("Cannot open " + DefaultCreateHandler.title(object, false));
@@ -87,6 +91,9 @@
public String computeURL(XModelObject o) {
if(o == null || !o.isActive()) return null;
+ if(!inited) {
+ init();
+ }
String u = null;
for (int i = 0; i < sources.length && u == null; i++) {
u = sources[i].computeURL(o);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2007-08-14 16:07:03 UTC (rev 3128)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2007-08-14 16:10:00 UTC (rev 3129)
@@ -46,7 +46,9 @@
"org.jboss.tools.jsf.model.handlers.run.RunOnServerHandler" //$NON-NLS-1$
};
- static {
+ public void init() {
+ if(inited) return;
+ inited = true;
//causes delegating IPathSource to RunOnServerContext
//this is temporal implementation
for (int i = 0; i < pathSources.length; i++) {
18 years, 4 months
JBoss Tools SVN: r3128 - trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-14 12:07:03 -0400 (Tue, 14 Aug 2007)
New Revision: 3128
Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java
Log:
EXIN-160
Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java 2007-08-14 16:06:15 UTC (rev 3127)
+++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/model/VRuleModel.java 2007-08-14 16:07:03 UTC (rev 3128)
@@ -101,14 +101,7 @@
public VAction getAction(String className) {
if (className == null || className.length() == 0) return null;
- try {
- return (VAction)ModelFeatureFactory.getInstance().createFeatureInstance(className);
- } catch (Exception th) {
- if(VerificationPlugin.isDebugEnabled()) {
- VerificationPlugin.getPluginLog().logError("Unable to create action \""+className+"\": " + "VRuleModel:getAction");
- }
- }
- return null;
+ return new VActionWrapper(className);
}
public String setAttributeValue(String name, String value) {
@@ -208,3 +201,43 @@
}
}
+
+class VActionWrapper implements VAction {
+ String classname;
+ VAction action;
+ VRule rule = null;
+
+ VActionWrapper(String classname) {
+ this.classname = classname;
+ }
+
+ public VResult[] check(VObject object) {
+ getAction();
+ if(action != null) action.setRule(rule);
+ return action != null ? action.check(object) : null;
+ }
+
+ public VRule getRule() {
+ return rule;
+ }
+
+ public void setRule(VRule rule) {
+ this.rule = rule;
+ }
+
+ VAction getAction() {
+ if(action != null) return action;
+ if (classname == null || classname.length() == 0) return null;
+ try {
+ action = (VAction)ModelFeatureFactory.getInstance().createFeatureInstance(classname);
+ } catch (Exception th) {
+ if(VerificationPlugin.isDebugEnabled()) {
+ VerificationPlugin.getPluginLog().logError("Unable to create action \""+classname+"\": " + "VRuleModel:getAction");
+ }
+ }
+ classname = null;
+ return action;
+ }
+
+}
+
18 years, 4 months
JBoss Tools SVN: r3127 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common: model/icons/impl and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-14 12:06:15 -0400 (Tue, 14 Aug 2007)
New Revision: 3127
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/XModelObjectIcon.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java
Log:
EXIN-160
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2007-08-14 15:34:05 UTC (rev 3126)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2007-08-14 16:06:15 UTC (rev 3127)
@@ -254,7 +254,7 @@
public void setAdoptManager(String adoptclass) {
try {
if(adoptclass != null && adoptclass.length() > 0) {
- adopt = (XAdoptManager)ModelFeatureFactory.getInstance().createFeatureInstance(adoptclass);
+ adopt = new XAdoptWrapper(adoptclass, this);
}
} catch (Exception e) {
ModelPlugin.getPluginLog().logError("XModelEntityImpl:setAdoptManager:" + e.getMessage());
@@ -428,3 +428,36 @@
}
}
+class XAdoptWrapper implements XAdoptManager {
+ String adoptclass;
+ XModelEntityImpl entity;
+
+ public XAdoptWrapper(String adoptclass, XModelEntityImpl entity) {
+ this.adoptclass = adoptclass;
+ this.entity = entity;
+ }
+
+ public void adopt(XModelObject target, XModelObject object, Properties p) {
+ validate();
+ if(entity.adopt != null) {
+ entity.adopt.adopt(target, object, p);
+ }
+ }
+
+ public boolean isAdoptable(XModelObject target, XModelObject object) {
+ validate();
+ return entity.adopt != null && entity.adopt.isAdoptable(target, object);
+ }
+
+ void validate() {
+ try {
+ if(adoptclass != null && adoptclass.length() > 0) {
+ entity.adopt = (XAdoptManager)ModelFeatureFactory.getInstance().createFeatureInstance(adoptclass);
+ }
+ } catch (Exception e) {
+ ModelPlugin.getPluginLog().logError("XModelEntityImpl:setAdoptManager:" + e.getMessage());
+ entity.adopt = null;
+ }
+ }
+
+}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/XModelObjectIcon.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/XModelObjectIcon.java 2007-08-14 15:34:05 UTC (rev 3126)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/XModelObjectIcon.java 2007-08-14 16:06:15 UTC (rev 3127)
@@ -18,7 +18,7 @@
public class XModelObjectIcon {
private static Hashtable<String,Image> cacheEclipse = new Hashtable<String,Image>();
- private static Hashtable<String,ImageComponent> components = null;
+ static Hashtable<String,ImageComponent> components = null;
private static synchronized void load(XModelObject object) {
if(components != null || object == null) return;
@@ -29,12 +29,7 @@
String[] keys = mapping.getKeys();
for (int i = 0; i < keys.length; i++) {
String v = mapping.getValue(keys[i]);
- try {
- ImageComponent c = (ImageComponent)ModelFeatureFactory.getInstance().createFeatureInstance(v);
- components.put(keys[i], c);
- } catch (Exception e) {
- ///XStudioPlugin.getDefault().getLog().log(new Status(Status.ERROR, XStudioPlugin.PLUGIN_ID, Status.OK, "Cannot load icon " + keys[i] + " " + v,e));
- }
+ components.put(keys[i], new ImageComponentWrapper(keys[i], v));
}
}
@@ -105,3 +100,41 @@
}
}
+
+class ImageComponentWrapper implements ImageComponent {
+ String key;
+ String classname;
+ ImageComponent imageComponent;
+
+ ImageComponentWrapper(String key, String classname) {
+ this.key = key;
+ this.classname = classname;
+ }
+
+ public int getHash(XModelObject obj) {
+ validate();
+ if(imageComponent == null) return 0;
+ return imageComponent.getHash(obj);
+ }
+
+ public Image getImage(XModelObject obj) {
+ validate();
+ if(imageComponent == null) return null;
+ return imageComponent.getImage(obj);
+ }
+
+ void validate() {
+ try {
+ ImageComponent c = (ImageComponent)ModelFeatureFactory.getInstance().createFeatureInstance(classname);
+ if(c == null) {
+ XModelObjectIcon.components.remove(key);
+ } else {
+ XModelObjectIcon.components.put(key, c);
+ }
+ } catch (Exception e) {
+ ///XStudioPlugin.getDefault().getLog().log(new Status(Status.ERROR, XStudioPlugin.PLUGIN_ID, Status.OK, "Cannot load icon " + keys[i] + " " + v,e));
+ XModelObjectIcon.components.remove(key);
+ }
+ }
+
+}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java 2007-08-14 15:34:05 UTC (rev 3126)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java 2007-08-14 16:06:15 UTC (rev 3127)
@@ -137,7 +137,7 @@
SharableElementImpl s = (SharableElementImpl)children.get(name);
if(s == null) return;
for (int i = 0; i < LIST.length; i++) {
- XScope sc = getXScope(LIST[i]);
+ XScope sc = s.getXScope(LIST[i]);
if(sc.exists() &&
!XStudioLoaderPeer.instance().isScopeEditable(LIST[i]))
return;
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java 2007-08-14 15:34:05 UTC (rev 3126)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java 2007-08-14 16:06:15 UTC (rev 3127)
@@ -11,17 +11,19 @@
package org.jboss.tools.common.model.project;
import java.util.*;
+
import org.jboss.tools.common.model.markers.ResourceMarkers;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.event.*;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
public class Watcher implements XModelTreeListener {
- static String[] CONTRIBUTORS = new String[]{
- "org.jboss.tools.struts.webprj.model.helpers.sync.SyncProjectContext",
- "org.jboss.tools.jsf.web.JSFWatcherContributor",
+ static String[][] CONTRIBUTORS = new String[][]{
+ {"org.jboss.tools.struts.webprj.model.helpers.sync.SyncProjectContext", "org.jboss.tools.struts.strutsnature"},
+ {"org.jboss.tools.jsf.web.JSFWatcherContributor", "org.jboss.tools.jsf.jsfnature"}
};
public static Watcher getInstance(XModel model) {
@@ -36,22 +38,9 @@
}
protected XModel model;
- protected IWatcherContributor[] contributors = new IWatcherContributor[0];
+ protected Map<String,IWatcherContributor> contributors = new HashMap<String, IWatcherContributor>();
private boolean lock = false;
-/*
- Job job;
-
- class WatcherJob extends Job {
- public WatcherJob() {
- super("Watcher" + XModelConstants.getWorkspace(model));
- }
- protected IStatus run(IProgressMonitor monitor) {
- Watcher.this.updateAll();
- return Status.OK_STATUS;
- }
-
- };
-*/
+
class WatcherRunnable implements XJob.XRunnable {
String id = "Watcher - " + XModelConstants.getWorkspace(model);
@@ -64,61 +53,65 @@
}
}
+
private Watcher() {
- loadContributors();
}
- void loadContributors() {
- ArrayList<IWatcherContributor> list = new ArrayList<IWatcherContributor>();
+ void updateContributors() {
+ if(model == null) return;
for (int i = 0; i < CONTRIBUTORS.length; i++) {
- try {
- Object watcher = ModelFeatureFactory.getInstance().createFeatureInstance(CONTRIBUTORS[i]);
- if(watcher instanceof IWatcherContributor)
- list.add((IWatcherContributor)watcher);
- else
- if(ModelPlugin.isDebugEnabled()) {
- ModelPlugin.getPluginLog().logInfo("Class is not implemented IWatcherContributor interface!");
- }
- } catch (Exception e) {
- ModelPlugin.getPluginLog().logError(e);
+ String nature = CONTRIBUTORS[i][1];
+ if(EclipseResourceUtil.hasNature(model, nature)) {
+ if(contributors.containsKey(nature)) {
+ continue;
+ } else {
+ try {
+ Object watcher = ModelFeatureFactory.getInstance().createFeatureInstance(CONTRIBUTORS[i][0]);
+ if(watcher instanceof IWatcherContributor) {
+ IWatcherContributor c = (IWatcherContributor)watcher;
+ c.init(model);
+ contributors.put(nature, c);
+ } else
+ if(ModelPlugin.isDebugEnabled()) {
+ ModelPlugin.getPluginLog().logInfo("Class is not implemented IWatcherContributor interface!");
+ }
+ } catch (Exception e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
+ }
+ } else {
+ contributors.remove(nature);
}
}
- contributors = list.toArray(new IWatcherContributor[0]);
}
public void setModel(XModel model) {
this.model = model;
- for (int i = 0; i < contributors.length; i++) {
- contributors[i].init(model);
- }
-// job = new WatcherJob();
}
public void forceUpdate() {
if(model.getProperties().getProperty(IModelNature.ECLIPSE_PROJECT) == null) return;
XJob.addRunnable(new WatcherRunnable());
-// if(job.getState() == Job.NONE) {
-// job.schedule(600);
-// };
}
private void updateAll() {
if(lock) return;
lock();
+ updateContributors();
try {
String err = null;
- for (int i = 0; i < contributors.length; i++) {
- if(!contributors[i].isActive()) continue;
- contributors[i].update();
+ for (IWatcherContributor c : contributors.values()) {
+ if(!c.isActive()) continue;
+ c.update();
if(err == null) {
- err = contributors[i].getError();
+ err = c.getError();
}
}
setError(err);
setCorrect(err == null);
- for (int i = 0; i < contributors.length; i++) {
- if(!contributors[i].isActive()) continue;
- contributors[i].updateProject();
+ for (IWatcherContributor c : contributors.values()) {
+ if(!c.isActive()) continue;
+ c.updateProject();
}
} finally {
unlock();
18 years, 4 months
JBoss Tools SVN: r3126 - trunk/documentation/GettingStartedGuide/docs/userguide/en/images.
by jbosstools-commits＠lists.jboss.org
Author: afedosik
Date: 2007-08-14 11:34:05 -0400 (Tue, 14 Aug 2007)
New Revision: 3126
Modified:
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj03.png
Log:
3-d chapter screenshots resizing
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj03.png
===================================================================
(Binary files differ)
18 years, 4 months
JBoss Tools SVN: r3125 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-14 10:57:33 -0400 (Tue, 14 Aug 2007)
New Revision: 3125
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
Log:
EXIN-292 - oops - it was not EXIN-160
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2007-08-14 14:55:32 UTC (rev 3124)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2007-08-14 14:57:33 UTC (rev 3125)
@@ -1148,7 +1148,7 @@
}
public void check(IEditorInput input, String[] natures, String warningKey) {
- //Suppress check: EXIN-160
+ //Suppress check: EXIN-292
natures = new String[0];
this.input = input;
@@ -1162,7 +1162,7 @@
this.natures = natures;
isAppropriateNature = isAppropriateNature(input);
if(!isAppropriateNature) {
-//Suppress check: EXIN-160
+//Suppress check: EXIN-292
// showWarning();
// if(this.input instanceof IFileEditorInput) {
// resource = ((IFileEditorInput)this.input).getFile();
18 years, 4 months
JBoss Tools SVN: r3124 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-14 10:55:32 -0400 (Tue, 14 Aug 2007)
New Revision: 3124
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
Log:
EXIN-160
Let us suppress that window prompting to add nature, and always try to show as much as possible in the editor.
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2007-08-14 14:46:39 UTC (rev 3123)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2007-08-14 14:55:32 UTC (rev 3124)
@@ -1148,6 +1148,9 @@
}
public void check(IEditorInput input, String[] natures, String warningKey) {
+ //Suppress check: EXIN-160
+ natures = new String[0];
+
this.input = input;
if(input instanceof IFileEditorInput) {
resource = ((IFileEditorInput)input).getFile();
@@ -1159,11 +1162,12 @@
this.natures = natures;
isAppropriateNature = isAppropriateNature(input);
if(!isAppropriateNature) {
- showWarning();
- if(this.input instanceof IFileEditorInput) {
- resource = ((IFileEditorInput)this.input).getFile();
- }
- isAppropriateNature = isAppropriateNature(this.input);
+//Suppress check: EXIN-160
+// showWarning();
+// if(this.input instanceof IFileEditorInput) {
+// resource = ((IFileEditorInput)this.input).getFile();
+// }
+// isAppropriateNature = isAppropriateNature(this.input);
}
}
18 years, 4 months
JBoss Tools SVN: r3123 - trunk/documentation/GettingStartedGuide/docs/userguide/en/images.
by jbosstools-commits＠lists.jboss.org
Author: afedosik
Date: 2007-08-14 10:46:39 -0400 (Tue, 14 Aug 2007)
New Revision: 3123
Modified:
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj01.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj02.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj03.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj04.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj05.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj06.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj07.png
Log:
3-d chapter screenshots resizing
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj01.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj02.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj03.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj04.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj05.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj06.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/SeamNewProj07.png
===================================================================
(Binary files differ)
18 years, 4 months
JBoss Tools SVN: r3122 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-08-14 10:32:23 -0400 (Tue, 14 Aug 2007)
New Revision: 3122
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java
Log:
http://jira.jboss.com/jira/browse/EXIN-438,
events haqndler was connected with xulrunner
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2007-08-14 14:23:00 UTC (rev 3121)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2007-08-14 14:32:23 UTC (rev 3122)
@@ -16,6 +16,7 @@
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMEvent;
import org.mozilla.interfaces.nsIDOMEventListener;
+import org.mozilla.interfaces.nsIDOMKeyEvent;
import org.mozilla.interfaces.nsIDOMMouseEvent;
import org.mozilla.interfaces.nsIDragSession;
import org.mozilla.interfaces.nsISelection;
@@ -37,6 +38,19 @@
// private VpeDnD dnd;
private EditorDomEventListener editorDomEventListener;
+ //possible events
+ public static final String MOUSEMOVEEVENTTYPE="mousemove";
+
+ public static final String MOUSEDOWNEVENTTYPE="mousedown";
+
+ public static final String MOUSEUPEVENTTYPE="mouseup";
+
+ public static final String CLICKEVENTTYPE="click";
+
+ public static final String KEYPRESS="keypress";
+
+ public static final String DBLCLICK="dblclick";
+
public MozillaDomEventListener() {
createCOMInterfaces();
}
@@ -95,6 +109,14 @@
editorDomEventListener = listener;
}
+ /**
+ * Returns event handler
+ * @return
+ */
+ private EditorDomEventListener getEditorDomEventListener(){
+
+ return editorDomEventListener;
+ }
// TODO Alexey Yukhovich add resizer support
// // IVpeResizeListener
// int EndResizing(int usedHandle, int newTop, int newLeft, int newWidth, int newHeight, int aResizedObject) {
@@ -311,7 +333,41 @@
/* (non-Javadoc)
* @see org.mozilla.interfaces.nsIDOMEventListener#handleEvent(org.mozilla.interfaces.nsIDOMEvent)
*/
- public void handleEvent(nsIDOMEvent arg0) {
+ public void handleEvent(nsIDOMEvent domEvent) {
+
+ if(getEditorDomEventListener()==null){
+
+ return;
+ } else if(MOUSEMOVEEVENTTYPE.equals(domEvent.getType())) {
+
+ nsIDOMMouseEvent mouseEvent;
+ mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
+ getEditorDomEventListener().mouseClick(mouseEvent);
+ } else if(MOUSEDOWNEVENTTYPE.equals(domEvent.getType())) {
+
+ nsIDOMMouseEvent mouseEvent;
+ mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
+ getEditorDomEventListener().mouseDown(mouseEvent);
+ } else if(MOUSEUPEVENTTYPE.equals(domEvent.getType())) {
+
+ nsIDOMMouseEvent mouseEvent;
+ mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
+ getEditorDomEventListener().mouseUp(mouseEvent);
+ } else if(CLICKEVENTTYPE.equals(domEvent.getType())) {
+
+ nsIDOMMouseEvent mouseEvent;
+ mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
+ getEditorDomEventListener().mouseUp(mouseEvent);
+ } else if(DBLCLICK.equals(domEvent.getType())) {
+
+ nsIDOMMouseEvent mouseEvent;
+ mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
+ getEditorDomEventListener().mouseDblClick(mouseEvent);
+ } else if(KEYPRESS.equals(domEvent.getType())) {
+
+ nsIDOMKeyEvent keyEvent = (nsIDOMKeyEvent) domEvent.queryInterface(nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID);
+ getEditorDomEventListener().keyPress(keyEvent);
+ }
}
/* (non-Javadoc)
18 years, 4 months