JBoss Tools SVN: r3000 - in branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-08-09 05:09:20 -0400 (Thu, 09 Aug 2007)
New Revision: 3000
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDropWindow.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/EditorDomEventListener.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaBaseEventListener.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTagDescription.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java
Log:
http://jira.jboss.org/jira/browse/EXIN-235 references to mozilla were extracted
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2007-08-09 08:46:05 UTC (rev 2999)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2007-08-09 09:09:20 UTC (rev 3000)
@@ -31,7 +31,6 @@
org.jboss.tools.vpe.editor.util,
org.jboss.tools.vpe.messages,meta
Require-Bundle: org.jboss.tools.common.model.ui,
- org.jboss.tools.vpe.mozilla,
org.eclipse.jface.text,
org.eclipse.jdt.core,
org.jboss.tools.common,
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-08-09 08:46:05 UTC (rev 2999)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-08-09 09:09:20 UTC (rev 3000)
@@ -13,6 +13,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -144,6 +145,7 @@
import org.mozilla.interfaces.nsISupports;
import org.mozilla.interfaces.nsISupportsArray;
import org.mozilla.interfaces.nsITransferable;
+import org.mozilla.xpcom.Mozilla;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -1130,8 +1132,9 @@
});
}
}
- public void onShowContextMenu(int contextFlags, nsIDOMMouseEvent mouseEvent, Node node) {
- nsIDOMNode visualNode = VisualDomUtil.getTargetNode(mouseEvent);
+
+ public void onShowContextMenu(long contextFlags, nsIDOMEvent event, nsIDOMNode node) {
+ nsIDOMNode visualNode = VisualDomUtil.getTargetNode(event);
if (visualNode != null) {
Node selectedSourceNode = null;
@@ -2417,4 +2420,12 @@
visualBuilder.innerDrop(node, parentNode, offset);
}
+ /* (non-Javadoc)
+ * @see org.mozilla.interfaces.nsISupports#queryInterface(java.lang.String)
+ */
+ @Override
+ public nsISupports queryInterface(String arg0) {
+ return Mozilla.getInstance().queryInterface(this, arg0);
+ }
+
}
\ No newline at end of file
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDropWindow.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDropWindow.java 2007-08-09 08:46:05 UTC (rev 2999)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDropWindow.java 2007-08-09 09:09:20 UTC (rev 3000)
@@ -10,32 +10,46 @@
******************************************************************************/
package org.jboss.tools.vpe.editor;
-import org.jboss.tools.common.model.ui.dnd.ModelTransfer;
-import org.eclipse.jface.util.*;
-import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.util.DelegatingDropAdapter;
+import org.eclipse.jface.util.TransferDropTargetListener;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DropTarget;
+import org.eclipse.swt.dnd.DropTargetEvent;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.HTMLTransfer;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.wst.common.ui.internal.dnd.ObjectTransfer;
import org.eclipse.wst.common.ui.internal.dnd.ViewerDropAdapter;
import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.ui.internal.contentoutline.*;
+import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.contentoutline.*;
+import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeContentProvider;
+import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider;
+import org.jboss.tools.common.model.ui.dnd.ModelTransfer;
+import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext;
import org.jboss.tools.jst.jsp.editor.IJSPTextEditor;
+import org.jboss.tools.vpe.editor.dnd.context.JSPViewerDropAdapter;
import org.w3c.dom.Node;
-import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext;
-import org.jboss.tools.vpe.editor.dnd.context.JSPViewerDropAdapter;
-import org.jboss.tools.vpe.mozilla.internal.swt.xpl.nsIDOMMouseEvent;
-
public class VpeDropWindow extends Window {
static final Color BACKGROUND_COLOR = new Color(null, 0xff, 0xff, 0xcd);
- nsIDOMMouseEvent event;
IJSPTextEditor editor;
boolean active = false;
TreeViewer treeViewer;
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2007-08-09 08:46:05 UTC (rev 2999)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2007-08-09 09:09:20 UTC (rev 3000)
@@ -45,7 +45,6 @@
import org.jboss.tools.vpe.editor.util.FlatIterator;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.TextUtil;
-import org.jboss.tools.vpe.mozilla.internal.swt.xpl.nsIFrameSelection;
import org.mozilla.interfaces.nsIDOMKeyEvent;
import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Attr;
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/EditorDomEventListener.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/EditorDomEventListener.java 2007-08-09 08:46:05 UTC (rev 2999)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/EditorDomEventListener.java 2007-08-09 09:09:20 UTC (rev 3000)
@@ -11,7 +11,7 @@
package org.jboss.tools.vpe.editor.mozilla;
-import org.jboss.tools.vpe.mozilla.browser.ContextMenuListener;
+import org.mozilla.interfaces.nsIContextMenuListener;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMEvent;
@@ -20,8 +20,9 @@
import org.mozilla.interfaces.nsIDOMMutationEvent;
import org.mozilla.interfaces.nsISelection;
-public interface EditorDomEventListener extends ContextMenuListener {
+public interface EditorDomEventListener extends nsIContextMenuListener {
+
// nsIDOMMutationListener
void subtreeModified(nsIDOMMutationEvent mutationEvent);
void nodeInserted(nsIDOMMutationEvent mutationEvent);
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaBaseEventListener.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaBaseEventListener.java 2007-08-09 08:46:05 UTC (rev 2999)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaBaseEventListener.java 2007-08-09 09:09:20 UTC (rev 3000)
@@ -11,14 +11,6 @@
package org.jboss.tools.vpe.editor.mozilla;
-import org.jboss.tools.vpe.VpePlugin;
-import org.jboss.tools.vpe.mozilla.browser.MozillaDebug;
-import org.jboss.tools.vpe.mozilla.internal.swt.xpl.VpeDnD;
-import org.jboss.tools.vpe.mozilla.internal.swt.xpl.XPCOM;
-import org.jboss.tools.vpe.mozilla.internal.swt.xpl.XPCOMObject;
-import org.jboss.tools.vpe.mozilla.internal.swt.xpl.nsIComponentManager;
-import org.jboss.tools.vpe.mozilla.internal.swt.xpl.nsID;
-import org.jboss.tools.vpe.mozilla.internal.swt.xpl.nsIDOMMouseEvent;
import org.mozilla.interfaces.nsIClipboardDragDropHooks;
import org.mozilla.interfaces.nsIDOMEvent;
import org.mozilla.interfaces.nsIDragSession;
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTagDescription.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTagDescription.java 2007-08-09 08:46:05 UTC (rev 2999)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTagDescription.java 2007-08-09 09:09:20 UTC (rev 3000)
@@ -10,21 +10,33 @@
******************************************************************************/
package org.jboss.tools.vpe.editor.template;
-import org.jboss.tools.vpe.mozilla.internal.swt.xpl.VpeResizer;
+// TODO Alexey Yukhovich add resizer support
+//import org.jboss.tools.vpe.mozilla.internal.swt.xpl.VpeResizer;
public class VpeTagDescription {
public static final int DISPLAY_TYPE_NONE = 0;
public static final int DISPLAY_TYPE_BLOCK = 1;
public static final int DISPLAY_TYPE_INLINE = 2;
- public static final int RESIZE_CONSTRAINS_TOPLEFT = VpeResizer.eTopLeft;
- public static final int RESIZE_CONSTRAINS_TOP = VpeResizer.eTop;
- public static final int RESIZE_CONSTRAINS_TOPRIGHT = VpeResizer.eTopRight;
- public static final int RESIZE_CONSTRAINS_LEFT = VpeResizer.eLeft;
- public static final int RESIZE_CONSTRAINS_RIGHT = VpeResizer.eRight;
- public static final int RESIZE_CONSTRAINS_BOTTOMLEFT = VpeResizer.eBottomLeft;
- public static final int RESIZE_CONSTRAINS_BOTTOM = VpeResizer.eBottom;
- public static final int RESIZE_CONSTRAINS_BOTTOMRIGHT = VpeResizer.eBottomRight;
+ // TODO Alexey Yukhovich add resuzer support
+// public static final int RESIZE_CONSTRAINS_TOPLEFT = VpeResizer.eTopLeft;
+// public static final int RESIZE_CONSTRAINS_TOP = VpeResizer.eTop;
+// public static final int RESIZE_CONSTRAINS_TOPRIGHT = VpeResizer.eTopRight;
+// public static final int RESIZE_CONSTRAINS_LEFT = VpeResizer.eLeft;
+// public static final int RESIZE_CONSTRAINS_RIGHT = VpeResizer.eRight;
+// public static final int RESIZE_CONSTRAINS_BOTTOMLEFT = VpeResizer.eBottomLeft;
+// public static final int RESIZE_CONSTRAINS_BOTTOM = VpeResizer.eBottom;
+// public static final int RESIZE_CONSTRAINS_BOTTOMRIGHT = VpeResizer.eBottomRight;
+ // TODO Alexey Yukhovich restore above resizer constraints
+ public static final int RESIZE_CONSTRAINS_TOPLEFT = 1;
+ public static final int RESIZE_CONSTRAINS_TOP = 2;
+ public static final int RESIZE_CONSTRAINS_TOPRIGHT = 4;
+ public static final int RESIZE_CONSTRAINS_LEFT = 8;
+ public static final int RESIZE_CONSTRAINS_RIGHT = 16;
+ public static final int RESIZE_CONSTRAINS_BOTTOMLEFT = 32;
+ public static final int RESIZE_CONSTRAINS_BOTTOM = 64;
+ public static final int RESIZE_CONSTRAINS_BOTTOMRIGHT = 128;
+
public static final int RESIZE_CONSTRAINS_NONE = 0;
public static final int RESIZE_CONSTRAINS_ALL = RESIZE_CONSTRAINS_TOPLEFT | RESIZE_CONSTRAINS_TOP | RESIZE_CONSTRAINS_TOPRIGHT | RESIZE_CONSTRAINS_LEFT | RESIZE_CONSTRAINS_RIGHT | RESIZE_CONSTRAINS_BOTTOMLEFT | RESIZE_CONSTRAINS_BOTTOM | RESIZE_CONSTRAINS_BOTTOMRIGHT;
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java 2007-08-09 08:46:05 UTC (rev 2999)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java 2007-08-09 09:09:20 UTC (rev 3000)
@@ -12,24 +12,17 @@
import java.util.HashSet;
-import org.w3c.dom.Attr;
+import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo;
+import org.jboss.tools.vpe.editor.VpeSourceInnerDropInfo;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
-import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo;
-import org.jboss.tools.vpe.editor.VpeSourceInnerDropInfo;
-import org.jboss.tools.vpe.editor.VpeVisualInnerDragInfo;
-import org.jboss.tools.vpe.editor.context.VpePageContext;
-import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
-import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
-import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
-import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
-import org.jboss.tools.vpe.mozilla.internal.swt.xpl.DataHelper;
-
public class VpeDnd {
static final String TAG_DRAG = VpeTemplateManager.VPE_PREFIX + "drag";
static final String TAG_DROP = VpeTemplateManager.VPE_PREFIX + "drop";
18 years, 4 months
JBoss Tools SVN: r2999 - in branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner: src/org/jboss/tools/vpe/xulrunner and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-08-09 04:46:05 -0400 (Thu, 09 Aug 2007)
New Revision: 2999
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
Log:
http://jira.jboss.org/jira/browse/EXIN-235 cosmetic fix
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2007-08-09 08:35:12 UTC (rev 2998)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2007-08-09 08:46:05 UTC (rev 2999)
@@ -7,7 +7,8 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.mozilla.xpcom,
- org.jboss.tools.vpe.mozilla.xulrunner
+ org.jboss.tools.vpe.mozilla.xulrunner,
+ org.jboss.tools.common
Eclipse-LazyStart: true
Export-Package: org.jboss.tools.vpe.xulrunner;uses:="org.eclipse.jface.resource,org.eclipse.ui.plugin,org.osgi.framework",
org.jboss.tools.vpe.xulrunner.browser;uses:="org.mozilla.interfaces,org.eclipse.swt.widgets,org.mozilla.xpcom",
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2007-08-09 08:35:12 UTC (rev 2998)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2007-08-09 08:46:05 UTC (rev 2999)
@@ -1,13 +1,13 @@
package org.jboss.tools.vpe.xulrunner;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.jboss.tools.common.log.BaseUIPlugin;
import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
*/
-public class BrowserPlugin extends AbstractUIPlugin {
+public class BrowserPlugin extends BaseUIPlugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.jboss.tools.vpe.xulrunner.browser";
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2007-08-09 08:35:12 UTC (rev 2998)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2007-08-09 08:46:05 UTC (rev 2999)
@@ -104,16 +104,12 @@
}
public nsIClipboardDragDropHookList getClipboardDragDropHookList() {
- try {
nsIDocShell docShell = getDocShell();
if (docShell != null) {
nsIClipboardDragDropHookList hookList = (nsIClipboardDragDropHookList) docShell.queryInterface(nsIClipboardDragDropHookList.NS_ICLIPBOARDDRAGDROPHOOKLIST_IID);
return hookList;
}
- } catch (Throwable t) {
- t.printStackTrace();
- }
return null;
}
18 years, 4 months
JBoss Tools SVN: r2997 - trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-09 03:06:41 -0400 (Thu, 09 Aug 2007)
New Revision: 2997
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp24.meta
Log:
JBIDE-686
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp24.meta
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp24.meta 2007-08-09 07:05:51 UTC (rev 2996)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/webapp24.meta 2007-08-09 07:06:41 UTC (rev 2997)
@@ -24,7 +24,7 @@
<ICON name="filter_mapping" path="images/webxml/filter_map.gif"/>
<ICON name="listener" path="images/webxml/listener_new.gif"/>
<ICON name="login_config" path="images/webxml/login_new.gif"/>
- <ICON name="message" path="images/process/new_input_message.gif"/>
+ <ICON name="message" path="images/webxml/new_message.gif"/>
<ICON name="mime_mapping" path="images/webxml/mime_map_new.gif"/>
<ICON name="param" path="images/webxml/init_param_new.gif"/>
<ICON name="res_env_ref" path="images/webxml/reference_new.gif"/>
@@ -33,7 +33,7 @@
<ICON name="run_as" path="images/webxml/run_as_new.gif"/>
<ICON name="security_constraint" path="images/webxml/security_constraint_new.gif"/>
<ICON name="security_role" path="images/webxml/security_role_new.gif"/>
- <ICON name="service" path="images/process/new_service.gif"/>
+ <ICON name="service" path="images/webxml/new_service.gif"/>
<ICON name="servlet" path="images/webxml/servlet_new.gif"/>
<ICON name="servlet_mapping" path="images/webxml/servlet_map_new.gif"/>
<ICON name="session" path="images/webxml/session_config_new.gif"/>
18 years, 4 months
JBoss Tools SVN: r2996 - trunk/common/plugins/org.jboss.tools.common.model/images/webxml.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-08-09 03:05:51 -0400 (Thu, 09 Aug 2007)
New Revision: 2996
Added:
trunk/common/plugins/org.jboss.tools.common.model/images/webxml/new_message.gif
trunk/common/plugins/org.jboss.tools.common.model/images/webxml/new_service.gif
Log:
JBIDE-686
Added: trunk/common/plugins/org.jboss.tools.common.model/images/webxml/new_message.gif
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.model/images/webxml/new_message.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/common/plugins/org.jboss.tools.common.model/images/webxml/new_service.gif
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.model/images/webxml/new_service.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 4 months
JBoss Tools SVN: r2995 - trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-09 00:42:48 -0400 (Thu, 09 Aug 2007)
New Revision: 2995
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
Log:
libraries were being completely ignored.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2007-08-09 03:29:32 UTC (rev 2994)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2007-08-09 04:42:48 UTC (rev 2995)
@@ -34,7 +34,7 @@
protected IClasspathEntry[] get32(IPath location, String config) {
ArrayList list = new ArrayList();
- IPath configPath = location.append("server").append("config");
+ IPath configPath = location.append("server").append(config);
addEntries(location.append("client"), list);
addEntries(location.append("lib"), list);
addEntries(configPath.append("lib"), list);
@@ -43,8 +43,8 @@
protected IClasspathEntry[] get40(IPath location, String config) {
ArrayList list = new ArrayList();
- IPath configPath = location.append("server").append("config");
- IPath deployPath = location.append("deploy");
+ IPath configPath = location.append("server").append(config);
+ IPath deployPath = configPath.append("deploy");
addEntries(location.append("client"), list);
addEntries(location.append("lib"), list);
addEntries(configPath.append("lib"), list);
@@ -56,8 +56,8 @@
protected IClasspathEntry[] get42(IPath location, String config) {
ArrayList list = new ArrayList();
- IPath configPath = location.append("server").append("config");
- IPath deployPath = location.append("deploy");
+ IPath configPath = location.append("server").append(config);
+ IPath deployPath = configPath.append("deploy");
addEntries(location.append("client"), list);
addEntries(location.append("lib"), list);
addEntries(configPath.append("lib"), list);
18 years, 4 months
JBoss Tools SVN: r2994 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-08 23:29:32 -0400 (Wed, 08 Aug 2007)
New Revision: 2994
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
Log:
unmakeDeployable
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-08-09 02:28:09 UTC (rev 2993)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-08-09 03:29:32 UTC (rev 2994)
@@ -356,6 +356,7 @@
// custom API to deploy / publish only one module.
IStatus t = deployer.publishOneModule(IServer.PUBLISH_FULL, new IModule[] { module}, ServerBehaviourDelegate.ADDED, monitor);
+ SingleDeployableFactory.unmakeDeployable(append);
return t;
} else {
return new Status(Status.WARNING, SeamCorePlugin.PLUGIN_ID, "Could not deploy datasource " + append);
18 years, 4 months
JBoss Tools SVN: r2993 - in trunk/seam/plugins: org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-08-08 22:28:09 -0400 (Wed, 08 Aug 2007)
New Revision: 2993
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-643
Validation is restored
Last selected Connection profile is saved as default
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java 2007-08-09 02:24:56 UTC (rev 2992)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java 2007-08-09 02:28:09 UTC (rev 2993)
@@ -23,7 +23,8 @@
*/
public class SeamFacetPreference {
public static final String SEAM_HOME_FOLDER = SeamCorePlugin.PLUGIN_ID + ".project.facet.seamhome";
-
+ public static final String SEAM_DEFAULT_CONNECTION_PROFILE = SeamCorePlugin.PLUGIN_ID + ".project.facet.default.conn.profile";
+
public static String getStringPreference(String name) {
return SeamCorePlugin.getDefault().getPreferenceStore().getString(SeamFacetPreference.SEAM_HOME_FOLDER);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2007-08-09 02:24:56 UTC (rev 2992)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2007-08-09 02:28:09 UTC (rev 2993)
@@ -17,6 +17,7 @@
import java.util.Set;
import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -29,6 +30,12 @@
public class SeamFacetInstallDataModelProvider extends
FacetInstallDataModelProvider implements ISeamFacetDataModelProperties {
+ @Override
+ public IStatus validate(String name) {
+ // TODO Auto-generated method stub
+ return super.validate(name);
+ }
+
public static final Map<String,String[]> SEAM_LIBRARIES= new HashMap<String,String[]>();
static {
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-08-09 02:24:56 UTC (rev 2992)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-08-09 02:28:09 UTC (rev 2993)
@@ -268,7 +268,7 @@
AntCopyUtils.copyFileToFolder(
hibernateConsolePref,
- new File(project.getLocation().toFile(),".settings"),
+ new File(project.getLocation().toFile(),".settings"),
new FilterSetCollection(projectFilterSet), true);
// In case of WAR configuration
@@ -330,12 +330,7 @@
}
}
}
-
-
-
-
-
-
+
if(s==null) {
return new Status(Status.WARNING, SeamCorePlugin.PLUGIN_ID, "No server selected to deploy datasource to");
}
@@ -477,10 +472,10 @@
create.schedule();
}
ClasspathHelper.addClasspathEntries(project, fv);
- project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-
+
EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
+ project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
}
public static boolean isWarConfiguration(IDataModel model) {
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-08-09 02:24:56 UTC (rev 2992)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-08-09 02:28:09 UTC (rev 2993)
@@ -33,13 +33,26 @@
Properties props = connProfile.getProperties("org.eclipse.datatools.connectivity.db.generic.connectionProfile");
// Collect properties name from DTP Connection Profile
- model.setProperty(ISeamFacetDataModelProperties.DB_USER_NAME,props.get("org.eclipse.datatools.connectivity.db.username").toString());
- model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_CLASS_NAME,props.get("org.eclipse.datatools.connectivity.db.driverClass").toString());
- model.setProperty(ISeamFacetDataModelProperties.DB_USERP_PASSWORD,props.get("org.eclipse.datatools.connectivity.db.password").toString());
- model.setProperty(ISeamFacetDataModelProperties.JDBC_URL_FOR_DB,props.get("org.eclipse.datatools.connectivity.db.URL").toString());
- model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH,DriverManager.getInstance().getDriverInstanceByID(
- props.get("org.eclipse.datatools.connectivity.driverDefinitionID").toString()).getJarListAsArray());
+ model.setProperty(ISeamFacetDataModelProperties.DB_USER_NAME,
+ props.get("org.eclipse.datatools.connectivity.db.username")==null
+ ?"":props.get("org.eclipse.datatools.connectivity.db.username").toString());
+ model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_CLASS_NAME,
+ props.get("org.eclipse.datatools.connectivity.db.driverClass")==null
+ ?"":props.get("org.eclipse.datatools.connectivity.db.driverClass").toString());
+
+ model.setProperty(ISeamFacetDataModelProperties.DB_USERP_PASSWORD,
+ props.get("org.eclipse.datatools.connectivity.db.password")==null
+ ?"":props.get("org.eclipse.datatools.connectivity.db.password").toString());
+
+ model.setProperty(ISeamFacetDataModelProperties.JDBC_URL_FOR_DB,
+ props.get("org.eclipse.datatools.connectivity.db.URL")==null
+ ?"":props.get("org.eclipse.datatools.connectivity.db.URL").toString());
+
+ model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH,
+ DriverManager.getInstance().getDriverInstanceByID(
+ props.get("org.eclipse.datatools.connectivity.driverDefinitionID").toString()).getJarListAsArray());
+
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2007-08-09 02:24:56 UTC (rev 2992)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2007-08-09 02:28:09 UTC (rev 2993)
@@ -22,15 +22,15 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
+import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
import org.jboss.tools.seam.core.SeamCorePlugin;
/**
@@ -98,16 +98,12 @@
}
public static String getServerRuntimeName(IProject project) {
- IJavaProject javaProject = JavaCore.create(project);
-
- if(javaProject!=null) {
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- return facetedProject.getPrimaryRuntime().getName();
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ try {
+ IFacetedProject facetedProject = ProjectFacetsManager.create(project);
+ IRuntime rt = facetedProject.getPrimaryRuntime();
+ return facetedProject.getPrimaryRuntime().getName();
+ } catch (CoreException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
}
return "";
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2007-08-09 02:24:56 UTC (rev 2992)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2007-08-09 02:28:09 UTC (rev 2993)
@@ -82,6 +82,7 @@
public void validateUntillError() {
page.setErrorMessage(getFirstValidationError());
page.setPageComplete(page.getErrorMessage()==null);
+ if(page.getErrorMessage()==null) page.setMessage(null);
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-08-09 02:24:56 UTC (rev 2992)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-08-09 02:28:09 UTC (rev 2993)
@@ -13,13 +13,17 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.datatools.connectivity.ConnectionProfileException;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.datatools.connectivity.db.generic.IDBConnectionProfileConstants;
import org.eclipse.datatools.connectivity.db.generic.ui.NewConnectionProfileWizard;
import org.eclipse.datatools.connectivity.ui.dse.dialogs.ProfileSelectionComposite;
+import org.eclipse.jdt.core.JavaConventions;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.WizardDialog;
@@ -56,6 +60,7 @@
public class SeamInstallWizardPage extends AbstractFacetWizardPage implements
IFacetWizardPage, IDataModelListener {
+ public static final String PAGE_DESCRIPTION = "Configure Seam Facet Settings";
/**
*
*/
@@ -93,7 +98,8 @@
IFieldEditor connProfileSelEditor = IFieldEditorFactory.INSTANCE
.createComboWithTwoButtons(
ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
- "Connection profile", getProfileNameList(), "", true,
+ "Connection profile:", getProfileNameList(), SeamCorePlugin.getDefault().getPluginPreferences().getString(
+ SeamFacetPreference.SEAM_DEFAULT_CONNECTION_PROFILE), true,
new EditConnectionProfileAction(),
new NewConnectionProfileAction(),
ValidatorFactory.NO_ERRORS_VALIDATOR);
@@ -176,7 +182,7 @@
setTitle("Seam Facet");
setImageDescriptor(ImageDescriptor.createFromFile(SeamFormWizard.class,
"SeamWebProjectWizBan.png"));
- setDescription("Configure Seam Facest Settings");
+ setDescription(PAGE_DESCRIPTION);
}
/**
@@ -207,8 +213,13 @@
public void transferStateToConfig() {
if( seamHomeRequiresSave) {
SeamCorePlugin.getDefault().getPluginPreferences().setValue(
- SeamFacetPreference.SEAM_HOME_FOLDER, jBossSeamHomeEditor.getValueAsString());
+ SeamFacetPreference.SEAM_HOME_FOLDER, jBossSeamHomeEditor.getValueAsString());
}
+ if("".equals(SeamCorePlugin.getDefault().getPluginPreferences().getString((
+ SeamFacetPreference.SEAM_DEFAULT_CONNECTION_PROFILE)))) {
+ SeamCorePlugin.getDefault().getPluginPreferences().setValue(
+ SeamFacetPreference.SEAM_DEFAULT_CONNECTION_PROFILE, connProfileSelEditor.getValueAsString());
+ }
}
@@ -286,10 +297,31 @@
registerEditor(testsPkgNameditor, generationGroup, 3);
setControl(root);
+ NewProjectDataModelFacetWizard wizard = (NewProjectDataModelFacetWizard) getWizard();
+
+ IDataModel model = wizard.getDataModel();
-
- setMessage(null);
- setErrorMessage(null);
+ if(validatorDelegate==null) {
+ validatorDelegate = new DataModelValidatorDelegate(this.model, this);
+ validatorDelegate.addValidatorForProperty(
+ jBossSeamHomeEditor.getName(),
+ ValidatorFactory.JBOSS_SEAM_HOME_FOLDER_VALIDATOR);
+ validatorDelegate
+ .addValidatorForProperty(connProfileSelEditor.getName(),
+ ValidatorFactory.CONNECTION_PROFILE_IS_NOT_SELECTED);
+ validatorDelegate
+ .addValidatorForProperty(testsPkgNameditor.getName(),
+ new PackageNameValidator(
+ testsPkgNameditor.getName(), "tests"));
+ validatorDelegate
+ .addValidatorForProperty(entityBeanPkgNameditor.getName(),
+ new PackageNameValidator(
+ entityBeanPkgNameditor.getName(), "entity beans"));
+ validatorDelegate
+ .addValidatorForProperty(sessionBeanPkgNameditor.getName(),
+ new PackageNameValidator(
+ sessionBeanPkgNameditor.getName(), "session beans"));
+ }
}
/**
@@ -421,32 +453,52 @@
*/
@Override
public void setVisible(boolean visible) {
- NewProjectDataModelFacetWizard wizard = (NewProjectDataModelFacetWizard) getWizard();
-
- IDataModel model = wizard.getDataModel();
sessionBeanPkgNameditor
- .setValue("org.domain."
- + model
- .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)
- + ".session");
+ .setValue("org.domain."
+ + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)
+ + ".session");
entityBeanPkgNameditor
- .setValue("org.domain."
- + model
- .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)
- + ".entity");
+ .setValue("org.domain."
+ + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)
+ + ".entity");
testsPkgNameditor
- .setValue("org.domain."
- + model
- .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)
- + ".test");
-
- validatorDelegate = new DataModelValidatorDelegate(model, this);
- validatorDelegate.addValidatorForProperty(
- jBossSeamHomeEditor.getName(),
- ValidatorFactory.JBOSS_SEAM_HOME_FOLDER_VALIDATOR);
- validatorDelegate
- .addValidatorForProperty(connProfileSelEditor.getName(),
- ValidatorFactory.CONNECTION_PROFILE_IS_NOT_SELECTED);
+ .setValue("org.domain."
+ + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)
+ + ".test");
+ if(visible) {
+ String message = validatorDelegate.getFirstValidationError();
+ this.setPageComplete(message==null);
+ this.setMessage(message);
+ }
super.setVisible(visible);
};
+
+ public class PackageNameValidator implements IValidator {
+
+ String fieldName;
+ String targetName;
+
+ /**
+ * @param fieldName
+ * @param targetName
+ */
+ public PackageNameValidator(String fieldName, String targetName) {
+ this.fieldName = fieldName;
+ this.targetName = targetName;
+ }
+
+ /**
+ * @see IValidator#validate(Object, Object)
+ */
+ public Map<String, String> validate(Object value, Object context) {
+ IStatus status = JavaConventions.validatePackageName(
+ value.toString(),
+ CompilerOptions.VERSION_1_5,
+ CompilerOptions.VERSION_1_5);
+ if(!status.isOK()) {
+ return ValidatorFactory.createErrormessage(fieldName, "Package name for " + targetName + " is not valid" );
+ }
+ return ValidatorFactory.NO_ERRORS;
+ }
+ }
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2007-08-09 02:24:56 UTC (rev 2992)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2007-08-09 02:28:09 UTC (rev 2993)
@@ -45,12 +45,13 @@
/**
*
*/
- static public Map<String, IValidator> validators = new HashMap<String, IValidator>();
+ static public Map<String, IValidator> validators
+ = new HashMap<String, IValidator>();
/**
*
*/
- static public Map<String, String> NO_ERRORS = Collections
+ static public final Map<String, String> NO_ERRORS = Collections
.unmodifiableMap(new HashMap<String, String>());
/**
@@ -94,7 +95,19 @@
/**
*
+ * @param text
+ * @return
*/
+ public static Map<String, String> createErrormessage(String propertyName,
+ String text) {
+ Map<String, String> map = createErrorMap();
+ map.put(propertyName, text);
+ return map;
+ }
+
+ /**
+ *
+ */
public static final IValidator FILE_SYSTEM_FOLDER_EXISTS = new IValidator() {
public Map<String, String> validate(Object value, Object context) {
@@ -129,7 +142,8 @@
return errors;
}
if (!new File(value.toString(), "seam").isFile()) {
- errors = createErrormessage("Seam Home Folde field points to location that doesn't look like seam home folder");
+ errors = createErrormessage("Seam Home Folde field points to " +
+ "location that doesn't look like seam home folder");
}
return errors;
@@ -150,10 +164,10 @@
return errors;
}
if (!new File(value.toString(), "bin/twiddle.jar").isFile()) {
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_AS_HOME,
- "JBoss AS Home Folde field points to location that doesn't look like JBoss AS home folder");
+ errors.put(
+ ISeamFacetDataModelProperties.JBOSS_AS_HOME,
+ "JBoss AS Home Folde field points to location that doesn't " +
+ "look like JBoss AS home folder");
}
return errors;
}
@@ -197,29 +211,11 @@
public static IValidator SEAM_COMPONENT_NAME_VALIDATOR = new IValidator() {
public Map<String, String> validate(Object value, Object context) {
- String targetName = null;
- IProject project = null;
- if (context instanceof Object[]) {
- Object[] contextArray = ((Object[]) context);
- targetName = contextArray[0].toString();
- project = (IProject) contextArray[1];
+ IStatus status = JavaConventions.validateClassFileName(value.toString()+".class", "5.0", "5.0");
+ if (!status.isOK()) {
+ return createErrormessage("{0} name is not valid.");
}
- // to allow qualified names for component use import statement as
- // target
- String classDecl = "import " + value.toString()
- + "; class Dummy {}";
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(classDecl.toCharArray());
- parser.setProject(JavaCore.create(project));
- CompilationUnit compilationUnit = (CompilationUnit) parser
- .createAST(null);
- IProblem[] problems = compilationUnit.getProblems();
-
- if (problems.length > 0) {
- return createErrormessage(targetName + " name is not valid.");
- }
-
return NO_ERRORS;
}
};
@@ -267,13 +263,10 @@
project = (IProject) contextArray[1];
}
- String classDecl = "class ClassName {public void "
- + value.toString() + "() {}}";
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(classDecl.toCharArray());
- parser.setProject(JavaCore.create(project));
- CompilationUnit compilationUnit = (CompilationUnit) parser
- .createAST(null);
+ CompilationUnit compilationUnit = createCompilationUnit(
+ "class ClassName {public void "
+ + value.toString() + "() {}}",project);
+
IProblem[] problems = compilationUnit.getProblems();
if (problems.length > 0) {
@@ -311,13 +304,13 @@
if (project == null || !(project instanceof IProject)
|| !project.exists()) {
- return createErrormessage("Project '" + value
- + "' does'n exist.");
+ return createErrormessage(
+ "Project '" + value + "' does'n exist.");
} else {
try {
if (!((IProject) project).hasNature(ISeamProject.NATURE_ID)) {
- return createErrormessage("Project '"
- + project.getName() + "' has no Seam nature.");
+ return createErrormessage(
+ "Project '" + project.getName() + "' has no Seam nature");
}
} catch (CoreException e) {
SeamCorePlugin.getPluginLog().logError(e);
@@ -327,12 +320,25 @@
}
};
- public static IValidator CONNECTION_PROFILE_IS_NOT_SELECTED = new IValidator() {
+ public static IValidator CONNECTION_PROFILE_IS_NOT_SELECTED =
+ new IValidator() {
public Map<String, String> validate(Object value, Object context) {
if (value == null || "".equals(value.toString().trim())) {
- return createErrormessage("Connection profile is not selected.");
+ return createErrormessage(
+ ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
+ "Connection profile is not selected");
}
return NO_ERRORS;
}
};
+
+ public static CompilationUnit createCompilationUnit(String classDecl,
+ IProject project) {
+ ASTParser parser = ASTParser.newParser(AST.JLS3);
+ parser.setSource(classDecl.toCharArray());
+ parser.setProject(JavaCore.create(project));
+ CompilationUnit compilationUnit = (CompilationUnit) parser
+ .createAST(null);
+ return compilationUnit;
+ }
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java 2007-08-09 02:24:56 UTC (rev 2992)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java 2007-08-09 02:28:09 UTC (rev 2993)
@@ -165,6 +165,7 @@
}
};
}
+
/**
*
*/
@@ -172,7 +173,7 @@
List values, Object defaultValue, boolean flat,
ButtonPressedAction action1, ButtonPressedAction action2,
IValidator validator) {
- CompositeEditor editor = new CompositeEditor("seam.project.connection.profile","Connection Profile",null);
+ CompositeEditor editor = new CompositeEditor(name,label,defaultValue);
editor.addFieldEditors(new IFieldEditor[]{
new LabelFieldEditor(name,label),
new ComboFieldEditor(name,label, values, defaultValue, false),
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-08-09 02:24:56 UTC (rev 2992)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-08-09 02:28:09 UTC (rev 2993)
@@ -27,6 +27,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
@@ -186,29 +187,29 @@
getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(!"war".equals(type));
errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(
- editorRegistry.get(IParameter.SEAM_COMPONENT_NAME).getValue(), new Object[]{"Seam component",project});
+ editorRegistry.get(IParameter.SEAM_COMPONENT_NAME).getValue(), null);
if(errors.size()>0) {
- setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
+ setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),"Seam component"));
setPageComplete(false);
return;
}
errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(
- editorRegistry.get(IParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), new Object[]{"Local interface",project});
+ editorRegistry.get(IParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), null);
if(errors.size()>0) {
- setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
+ setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),"Local interface"));
setPageComplete(false);
return;
}
if(!isWar()) {
errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(
- editorRegistry.get(IParameter.SEAM_BEAN_NAME).getValue(), new Object[]{"Bean",project});
+ editorRegistry.get(IParameter.SEAM_BEAN_NAME).getValue(), null);
if(errors.size()>0) {
- setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
+ setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),"Bean"));
setPageComplete(false);
return;
}
18 years, 4 months
JBoss Tools SVN: r2991 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-08-08 21:33:13 -0400 (Wed, 08 Aug 2007)
New Revision: 2991
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java
Log:
equals comparison were wrong
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java 2007-08-09 01:07:40 UTC (rev 2990)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/stripped/DeployableServerBehavior.java 2007-08-09 01:33:13 UTC (rev 2991)
@@ -63,7 +63,7 @@
case ServerBehaviourDelegate.CHANGED: System.out.print("changed"); break;
case ServerBehaviourDelegate.REMOVED: System.out.print("removed"); break;
}
- System.out.println(" to server " + getServer().getId());
+ System.out.println(" to server " + getServer().getName() + "(" + getServer().getId() + ")");
}
protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException {
// kind = [incremental, full, auto, clean] = [1,2,3,4]
@@ -84,7 +84,7 @@
publisher = new JstPublisher(getServer(), root);
} else if( isPackagesTypeModule(module[i]) ) {
publisher = new PackagesPublisher(getServer(), root);
- } else if( module[i].getModuleType().equals("jboss.singlefile")){
+ } else if( module[i].getModuleType().getId().equals("jboss.singlefile")){
publisher = new SingleFilePublisher(getServer());
} else {
publisher = new NullPublisher();
18 years, 4 months