JBoss Tools SVN: r11670 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-11-11 08:21:36 -0500 (Tue, 11 Nov 2008)
New Revision: 11670
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java
Log:
JBIDE-3162
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java 2008-11-11 12:53:13 UTC (rev 11669)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editor/XMLContentDescriber.java 2008-11-11 13:21:36 UTC (rev 11670)
@@ -41,8 +41,10 @@
private int describe(String text, IContentDescription description) {
String entity = PreferenceModelUtilities.getPreferenceModel().getEntityRecognizer().getEntityName("xml", text);
- if(entity == null || entity.length() == 0 || entity.equals("FileXML") ||
- entity.equals("FileHibConfig3") || entity.equals("FileHibernate3")) {
+ if(entity == null || entity.length() == 0 || entity.equals("FileXML")
+ || entity.equals("FileHibConfig3") || entity.equals("FileHibernate3")
+ || entity.equals("FileANT")
+ ) {
return INDETERMINATE;
}
return VALID;
17 years, 5 months
JBoss Tools SVN: r11669 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: template and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-11-11 07:53:13 -0500 (Tue, 11 Nov 2008)
New Revision: 11669
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3072
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-11-11 12:47:50 UTC (rev 11668)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-11-11 12:53:13 UTC (rev 11669)
@@ -127,6 +127,7 @@
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
+import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
import org.jboss.tools.vpe.editor.menu.NodeActionManager;
import org.jboss.tools.vpe.editor.menu.BaseActionManager.MyMenuManager;
import org.jboss.tools.vpe.editor.mozilla.EditorDomEventListener;
@@ -147,6 +148,7 @@
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager;
import org.jboss.tools.vpe.editor.util.DocTypeUtil;
+import org.jboss.tools.vpe.editor.util.NodesManagingUtil;
import org.jboss.tools.vpe.editor.util.SelectionUtil;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.jboss.tools.vpe.editor.util.VpeDndUtil;
@@ -167,6 +169,7 @@
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsIFile;
import org.mozilla.interfaces.nsISelection;
+import org.mozilla.interfaces.nsISelectionController;
import org.mozilla.interfaces.nsISelectionListener;
import org.mozilla.interfaces.nsISupports;
import org.mozilla.interfaces.nsISupportsCString;
@@ -216,6 +219,8 @@
private static final int AROUND_MENU = 1;
private static final int BEFORE_MENU = 2;
private static final int AFTER_MENU = 3;
+
+ private static final int LEFT_BUTTON = 0;
private CSSReferenceList cssReferenceListListener;
private TaglibReferenceList taglibReferenceListListener;
@@ -1042,7 +1047,10 @@
try {
mouseUpSelectionReasonFlag = (reason & nsISelectionListener.MOUSEUP_REASON) > 0;
if (mouseUpSelectionReasonFlag
- || reason == nsISelectionListener.NO_REASON
+ // commited by Dzmitrovich - experimental
+ // TODO check selection and if are appear errors then
+ // uncommented next code
+ // || reason == nsISelectionListener.NO_REASON
|| reason == nsISelectionListener.KEYPRESS_REASON
|| reason == nsISelectionListener.SELECTALL_REASON
|| (reason & nsISelectionListener.MOUSEDOWN_REASON) > 0) {
@@ -1058,6 +1066,7 @@
* Checking if the node is of text type was removed
* to allow <select> node to be selected on the first click.
*/
+
if (node != null) {
selectionManager.setSelection(selection);
}
@@ -1130,8 +1139,11 @@
// }
// }
+
+ // selection will be set only if press left button
+ if (mouseEvent.getButton() == LEFT_BUTTON)
+ selectionManager.setSelection(mouseEvent);
- selectionManager.setSelection(mouseEvent);
} finally {
switcher.stopActiveEditor();
}
@@ -1394,9 +1406,8 @@
if (!topLevelFlag) {
manager.add(new VpeAction("Select This Tag", node) { //$NON-NLS-1$
public void run() {
- selectionBuilder.setVisualSelection(
- actionNode, 0, actionNode, 0,
- false, true);
+ SelectionUtil.setSourceSelection(
+ pageContext, actionNode);
}
});
@@ -1431,19 +1442,40 @@
IContributionItem[] items = manager.getItems();
+ // fixed for JBIDE-3072
+ // add "insert arround",
for (int i = 0; i < items.length; i++) {
if (items[i] instanceof MenuManager) {
MenuManager mm = (MenuManager) items[i];
+ int type = 0;
+ Point region = null;
if (NodeActionManager.INSERT_AROUND_MENU.equals(mm
.getMenuText())) {
- listenContextMenu(mm, (IndexedRegion) node, AROUND_MENU);
+ type = AROUND_MENU;
+
+ // if node is text then allow to wrap only selected text
+ if (node.getNodeType() == Node.TEXT_NODE) {
+
+ region = SelectionUtil
+ .getSourceSelectionRange(sourceEditor);
+ }
+ // else wrap all tag
+ else {
+ region = NodesManagingUtil.getNodeRange(node);
+ }
+
} else if (NodeActionManager.INSERT_BEFORE_MENU.equals(mm
.getMenuText())) {
- listenContextMenu(mm, (IndexedRegion) node, BEFORE_MENU);
+ type = BEFORE_MENU;
+ region = new Point(NodesManagingUtil
+ .getStartOffsetNode(node), 0);
} else if (NodeActionManager.INSERT_AFTER_MENU.equals(mm
.getMenuText())) {
- listenContextMenu(mm, (IndexedRegion) node, AFTER_MENU);
+ type = AFTER_MENU;
+ region = new Point(
+ NodesManagingUtil.getEndOffsetNode(node), 0);
}
+ listenContextMenu(mm, region, type);
}
}
@@ -1620,36 +1652,45 @@
*/
public void onShowContextMenu(long contextFlags, nsIDOMEvent event,
nsIDOMNode node) {
- nsIDOMNode visualNode = VisualDomUtil.getTargetNode(event);
+
+ //FIXED FOR JBIDE-3072 by sdzmitrovich
+
+ // nsIDOMNode visualNode = VisualDomUtil.getTargetNode(event);
+ // if (visualNode != null) {
+ Node selectedSourceNode = null;
- if (visualNode != null) {
- Node selectedSourceNode = null;
- selectedSourceNode = selectionBuilder
- .setContextMenuSelection(visualNode);
- if (selectedSourceNode != null) {
+ VpeNodeMapping nodeMapping = SelectionUtil
+ .getNodeMappingBySourceSelection(sourceEditor, domMapping);
- MenuManager menuManager = new MenuManager("#popup"); //$NON-NLS-1$
- final Menu contextMenu = menuManager
- .createContextMenu(visualEditor.getControl());
- contextMenu.addMenuListener(new MenuListener() {
- Menu menu = contextMenu;
+ if (nodeMapping != null)
+ selectedSourceNode = nodeMapping.getSourceNode();
- public void menuHidden(MenuEvent e) {
- Display.getCurrent().asyncExec(new Runnable() {
- public void run() {
- menu.dispose();
- }
- });
- }
+ // selectedSourceNode = selectionBuilder
+ // .setContextMenuSelection(visualNode);
+ if (selectedSourceNode != null) {
- public void menuShown(MenuEvent e) {
- }
- });
- createMenuForNode(selectedSourceNode, menuManager, true);
+ MenuManager menuManager = new MenuManager("#popup"); //$NON-NLS-1$
+ final Menu contextMenu = menuManager.createContextMenu(visualEditor
+ .getControl());
+ contextMenu.addMenuListener(new MenuListener() {
+ Menu menu = contextMenu;
- contextMenu.setVisible(true);
+ public void menuHidden(MenuEvent e) {
+ Display.getCurrent().asyncExec(new Runnable() {
+ public void run() {
+ menu.dispose();
+ }
+ });
+ }
- }
+ public void menuShown(MenuEvent e) {
+ }
+ });
+ createMenuForNode(selectedSourceNode, menuManager, true);
+
+ contextMenu.setVisible(true);
+
+ // }
}
}
@@ -2110,7 +2151,7 @@
}
}
- private void listenContextMenu(MenuManager manager, IndexedRegion region,
+ private void listenContextMenu(MenuManager manager, Point region,
int type) {
MenuManager mm = new MyMenuManager("From Palette", true); //$NON-NLS-1$
manager.add(mm);
@@ -2119,11 +2160,11 @@
class VpeMenuListener implements IMenuListener {
private MenuManager manager;
- private IndexedRegion region;
+ private Point region;
private int type;
private boolean loaded = false;
- public VpeMenuListener(MenuManager manager, IndexedRegion region,
+ public VpeMenuListener(MenuManager manager, Point region,
int type) {
this.manager = manager;
this.region = region;
@@ -2134,13 +2175,13 @@
if (loaded)
return;
loaded = true;
- fillContextMenuFromPalette(manager, region, type);
+ fillContextMenuFromPalette(manager, region , type);
manager.getParent().update(true);
}
}
private MenuManager fillContextMenuFromPalette(MenuManager manager,
- IndexedRegion region, int type) {
+ Point region, int type) {
XModelObject model = ModelUtilities.getPreferenceModel().getByPath(
"%Palette%"); //$NON-NLS-1$
@@ -2155,7 +2196,7 @@
return manager;
}
- private void fillPaletteFolder(MenuManager menu, IndexedRegion region,
+ private void fillPaletteFolder(MenuManager menu, Point region,
XModelObject folder, int type) {
XModelObject[] groups = folder.getChildren();
for (int i = 0; i < groups.length; i++) {
@@ -2167,7 +2208,7 @@
}
}
- private void fillPaletteGroup(MenuManager menu, IndexedRegion region,
+ private void fillPaletteGroup(MenuManager menu, Point region,
XModelObject group, int type) {
XModelObject[] items = group.getChildren();
String endText;
@@ -2181,7 +2222,7 @@
}
}
- private void createInsertAction(MenuManager menu, IndexedRegion region,
+ private void createInsertAction(MenuManager menu, Point region,
XModelObject item, int type) {
XModelObject parent = item.getParent();
@@ -2200,10 +2241,10 @@
class InsertAction extends Action {
private XModelObject item;
private int type;
- private IndexedRegion region;
+ private Point region;
- public InsertAction(String title, IndexedRegion region,
- XModelObject item, int type) {
+ public InsertAction(String title, Point region, XModelObject item,
+ int type) {
super(title);
this.item = item;
this.type = type;
@@ -2212,73 +2253,56 @@
public void run() {
- String tagName = item.getAttributeValue("name"); //$NON-NLS-1$
+ String tagName = item.getAttributeValue("name"); //$NON-NLS-1$
- XModelObject parent = item.getParent();
- String uri = (parent == null) ? "" : parent.getAttributeValue(URIConstants.LIBRARY_URI); //$NON-NLS-1$
- String libraryVersion = (parent == null) ? "" : parent.getAttributeValue(URIConstants.LIBRARY_VERSION); //$NON-NLS-1$
- String defaultPrefix = (parent == null) ? "" : parent.getAttributeValue(URIConstants.DEFAULT_PREFIX); //$NON-NLS-1$
-
- /*
- * Fixes https://jira.jboss.org/jira/browse/JBIDE-1363.
- * Fixes https://jira.jboss.org/jira/browse/JBIDE-2442.
- * author: dmaliarevich
- * StructuredSelectionProvider from source view is used
- * instead of VpeSelectionProvider.
- * It helps automatically update selection range
- * after taglib insertion.
- */
- StructuredTextViewer structuredTextViewer = null;
- structuredTextViewer = getSourceEditor().getTextViewer();
- int offset = 0;
- int length = 0;
-
- String startText = "" + item.getAttributeValue("start text"); //$NON-NLS-1$ //$NON-NLS-2$
- String endText = "" + item.getAttributeValue("end text"); //$NON-NLS-1$ //$NON-NLS-2$
- if (type == AROUND_MENU) {
- /*
- * In this case node was already selected correctly.
- */
- } else if (type == BEFORE_MENU) {
- offset = region.getStartOffset();
- length = 0;
- structuredTextViewer.setSelectedRange(offset, length);
- structuredTextViewer.revealRange(offset, length);
- } else if (type == AFTER_MENU) {
- offset = region.getEndOffset();
- length = 0;
- structuredTextViewer.setSelectedRange(offset, length);
- structuredTextViewer.revealRange(offset, length);
- }
-
- /*
- * Gets source editor's selection provider
- * with updated text selection.
- */
- ISelectionProvider selProvider = getSourceEditor().getSelectionProvider();
+ XModelObject parent = item.getParent();
+ String uri = (parent == null) ? "" : parent.getAttributeValue(URIConstants.LIBRARY_URI); //$NON-NLS-1$
+ String libraryVersion = (parent == null) ? "" : parent.getAttributeValue(URIConstants.LIBRARY_VERSION); //$NON-NLS-1$
+ String defaultPrefix = (parent == null) ? "" : parent.getAttributeValue(URIConstants.DEFAULT_PREFIX); //$NON-NLS-1$
- Properties p = new Properties();
- p.setProperty("tag name", tagName); //$NON-NLS-1$
- p.setProperty("start text", startText); //$NON-NLS-1$
- p.setProperty("end text", endText); //$NON-NLS-1$
- p
- .setProperty(
- "automatically reformat tag body", "" + item.getAttributeValue("automatically reformat tag body")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- p.setProperty(URIConstants.LIBRARY_URI, uri);
- p.setProperty(URIConstants.LIBRARY_VERSION, libraryVersion);
- String addTaglib = item.getParent().getAttributeValue(
- TLDToPaletteHelper.ADD_TAGLIB);
- p.setProperty(URIConstants.DEFAULT_PREFIX, defaultPrefix);
- p.setProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB,
- addTaglib);
- /*
- * Added by Dzmitry Sakovich Fix for JBIDE-1626
- */
- // if(((Node)region).getNodeType() == Node.ELEMENT_NODE)
- p.put("selectionProvider", selProvider); //$NON-NLS-1$
- PaletteInsertHelper.insertIntoEditor(sourceEditor
- .getTextViewer(), p);
+ /*
+ * Fixes https://jira.jboss.org/jira/browse/JBIDE-1363. Fixes
+ * https://jira.jboss.org/jira/browse/JBIDE-2442. author:
+ * dmaliarevich StructuredSelectionProvider from source view is used
+ * instead of VpeSelectionProvider. It helps automatically update
+ * selection range after taglib insertion.
+ */
+ String startText = "" + item.getAttributeValue("start text"); //$NON-NLS-1$ //$NON-NLS-2$
+ String endText = "" + item.getAttributeValue("end text"); //$NON-NLS-1$ //$NON-NLS-2$
+
+ //set source selection
+ SelectionUtil.setSourceSelection(pageContext, region.x, region.y);
+
+
+ /*
+ * Gets source editor's selection provider with updated text
+ * selection.
+ */
+ ISelectionProvider selProvider = getSourceEditor()
+ .getSelectionProvider();
+
+ Properties p = new Properties();
+ p.setProperty("tag name", tagName); //$NON-NLS-1$
+ p.setProperty("start text", startText); //$NON-NLS-1$
+ p.setProperty("end text", endText); //$NON-NLS-1$
+ p
+ .setProperty(
+ "automatically reformat tag body", "" + item.getAttributeValue("automatically reformat tag body")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ p.setProperty(URIConstants.LIBRARY_URI, uri);
+ p.setProperty(URIConstants.LIBRARY_VERSION, libraryVersion);
+ String addTaglib = item.getParent().getAttributeValue(
+ TLDToPaletteHelper.ADD_TAGLIB);
+ p.setProperty(URIConstants.DEFAULT_PREFIX, defaultPrefix);
+ p.setProperty(PaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, addTaglib);
+ /*
+ * Added by Dzmitry Sakovich Fix for JBIDE-1626
+ */
+ // if(((Node)region).getNodeType() == Node.ELEMENT_NODE)
+ p.put("selectionProvider", selProvider); //$NON-NLS-1$
+ PaletteInsertHelper.insertIntoEditor(sourceEditor.getTextViewer(),
+ p);
+
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2008-11-11 12:47:50 UTC (rev 11668)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2008-11-11 12:53:13 UTC (rev 11669)
@@ -393,46 +393,7 @@
}
- /**
- *
- * @deprecated
- * Restore cursor position in visual document for by source position
- *
- * @param visualNode
- * @param focusOffcetInSourceDocument
- */
- private void restoreVisualCursorPositionForTextNode(nsIDOMNode visualNode,
- int focusOffcetInSourceDocument, IStructuredModel model) {
- if (visualNode == null)
- return;
-
- nsIDOMNode targetVisualNode = visualNode.getFirstChild();
-
- if (targetVisualNode == null
- || targetVisualNode.getNodeType() != nsIDOMNode.TEXT_NODE) {
- return;
- }
-
- IndexedRegion targetSourceNode = (IndexedRegion) SelectionUtil
- .getSourceNodeByPosition(model, focusOffcetInSourceDocument);
- // should be a text node
- if (((Node) targetSourceNode).getNodeType() != Node.TEXT_NODE) {
- return;
- }
- int offcetReferenceToSourceNode = focusOffcetInSourceDocument
- - targetSourceNode.getStartOffset();
-
- int visualNodeOffcet = TextUtil.visualPosition(
- ((Node) targetSourceNode).getNodeValue(),
- offcetReferenceToSourceNode);
-
- selectionController.getSelection(
- nsISelectionController.SELECTION_NORMAL).collapse(
- targetVisualNode, visualNodeOffcet);
-
- }
-
protected VpePageContext getPageContext() {
return pageContext;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java 2008-11-11 12:47:50 UTC (rev 11668)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java 2008-11-11 12:53:13 UTC (rev 11669)
@@ -11,6 +11,7 @@
package org.jboss.tools.vpe.editor.util;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
import org.jboss.tools.vpe.editor.context.VpePageContext;
@@ -110,6 +111,17 @@
}
/**
+ *
+ * @param node
+ * @return
+ */
+ public static Point getNodeRange(Node node) {
+
+ return new Point(getStartOffsetNode(node), getNodeLength(node));
+
+ }
+
+ /**
* if position belong to node return true
*
* @param node
@@ -147,7 +159,7 @@
return locale;
}
-
+
/**
*
* @param pageContext
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2008-11-11 12:47:50 UTC (rev 11668)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2008-11-11 12:53:13 UTC (rev 11669)
@@ -35,7 +35,6 @@
*/
public class SelectionUtil {
-
/**
* get selected visual node from nsISelection
*
@@ -62,9 +61,10 @@
}
return null;
}
-
+
/**
* select node completely
+ *
* @param pageContext
* @param node
*/
@@ -92,12 +92,16 @@
int start = NodesManagingUtil.getStartOffsetNode(node);
- pageContext.getSourceBuilder().getStructuredTextViewer().setSelectedRange(start + offset, length);
- pageContext.getSourceBuilder().getStructuredTextViewer().revealRange(
- start + offset, length);
+ setSourceSelection(pageContext, start + offset, length);
}
+ /**
+ *
+ * @param pageContext
+ * @param node
+ * @param offset
+ */
public static void setSourceSelection(VpePageContext pageContext,
Node node, int offset) {
@@ -108,6 +112,22 @@
}
+ /**
+ *
+ * @param pageContext
+ * @param offset
+ * @param length
+ */
+ public static void setSourceSelection(VpePageContext pageContext,
+ int offset, int length) {
+
+ pageContext.getSourceBuilder().getStructuredTextViewer()
+ .setSelectedRange(offset, length);
+ pageContext.getSourceBuilder().getStructuredTextViewer().revealRange(
+ offset, length);
+
+ }
+
public static VpeNodeMapping getNodeMappingBySourceSelection(
IStructuredModel model, VpeDomMapping domMapping, int focus,
int anchor) {
@@ -185,12 +205,14 @@
nsIDOMNode focusedNode = getSelectedNode(selection);
// gets visual selection range
Point sourceRange = new Point(0, 0);
- //converts to source selection
- if (sourceNode != null) {
- sourceRange.x = TextUtil.sourcePosition(sourceNode.getNodeValue(), focusedNode.getNodeValue(), selection.getFocusOffset());
- sourceRange.y = TextUtil.sourcePosition(sourceNode.getNodeValue(), focusedNode.getNodeValue(), selection.getAnchorOffset())
- - sourceRange.x;
- }
+ // converts to source selection
+ if (sourceNode != null) {
+ sourceRange.x = TextUtil.sourcePosition(sourceNode.getNodeValue(),
+ focusedNode.getNodeValue(), selection.getFocusOffset());
+ sourceRange.y = TextUtil.sourcePosition(sourceNode.getNodeValue(),
+ focusedNode.getNodeValue(), selection.getAnchorOffset())
+ - sourceRange.x;
+ }
return sourceRange;
}
@@ -270,7 +292,7 @@
return null;
}
-
+
/**
*
* @param selectionController
17 years, 5 months
JBoss Tools SVN: r11667 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-11-11 07:12:24 -0500 (Tue, 11 Nov 2008)
New Revision: 11667
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
Log:
ps://jira.jboss.org/jira/browse/JBIDE-2740
DriverClassHelpers.getDialect() check for null argument
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-11-11 12:06:56 UTC (rev 11666)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-11-11 12:12:24 UTC (rev 11667)
@@ -277,7 +277,13 @@
return fullName;
}
+ /**
+ *
+ * @param driverclass
+ * @return dialect by driverclass.
+ */
public String getDialect(String driverclass) {
+ if (driverclass == null) return null;
return driverToDialect.get(driverclass);
}
17 years, 5 months
JBoss Tools SVN: r11666 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-11-11 07:06:56 -0500 (Tue, 11 Nov 2008)
New Revision: 11666
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
Log:
ps://jira.jboss.org/jira/browse/JBIDE-2740
DriverClassHelpers.getShortDialectNane() changed
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2008-11-11 12:06:52 UTC (rev 11665)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2008-11-11 12:06:56 UTC (rev 11666)
@@ -126,7 +126,7 @@
driverHolder.addPropertyChangeListener(new PropertyChangeListener() {
public void propertyChanged(PropertyChangeEvent event) {
- String driverClass = helper.getDialectClass((String) event.getNewValue());
+ String driverClass = (String) event.getNewValue();
String[] connectionURLS = helper.getConnectionURLS(driverClass);
String url = urlHolder.getValue();//save value
lvmUrl.clear();
@@ -199,18 +199,13 @@
BasicHibernateProperties.DIALECT_PROPERTY) {
@Override
protected String buildValue_() {
- String dialect = subject.getDialect();
- String value = helper.getShortDialectName(dialect);
- if (value == null) value = dialect;
- return value;
+ return helper.getShortDialectName(subject.getDialect());
}
@Override
protected void setValue_(String value) {
if ("".equals(value))value = null; //$NON-NLS-1$
- String dialect = helper.getDialectClass(value);
- if (dialect == null) dialect = value;
- subject.setDialect(dialect);
+ subject.setDialect(helper.getDialectClass(value));
}
};
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-11-11 12:06:52 UTC (rev 11665)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-11-11 12:06:56 UTC (rev 11666)
@@ -306,8 +306,7 @@
private String determineDialect() {
if (!AUTODETECT.equals(dialectName.getText())){
- String dialect = helper.getDialectClass(dialectName.getText());
- return dialect != null ? dialect : dialectName.getText();
+ return helper.getDialectClass(dialectName.getText());
}
if (!selectMethod.getSelection()){
IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName());
17 years, 5 months
JBoss Tools SVN: r11665 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse: launch and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-11-11 07:06:52 -0500 (Tue, 11 Nov 2008)
New Revision: 11665
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java
Log:
ps://jira.jboss.org/jira/browse/JBIDE-2740
DriverClassHelpers.getShortDialectNane() changed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-11-11 11:19:01 UTC (rev 11664)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-11-11 12:06:52 UTC (rev 11665)
@@ -263,13 +263,18 @@
return (String[]) list.toArray(new String[list.size()]);
}
+ /**
+ *
+ * @param fullName
+ * @return short dialect name by corresponding class if available, otherwise return fullName assuming it is a "raw" classname.
+ */
public String getShortDialectName(String fullName) {
Iterator keyIterator = dialectNames.keySet().iterator();
while (keyIterator.hasNext()){
String key = (String)keyIterator.next();
if (dialectNames.get(key).equals(fullName)) return key;
}
- return null;
+ return fullName;
}
public String getDialect(String driverclass) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java 2008-11-11 11:19:01 UTC (rev 11664)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java 2008-11-11 12:06:52 UTC (rev 11665)
@@ -89,8 +89,7 @@
try {
String dialect = configuration.getAttribute( IConsoleConfigurationLaunchConstants.DIALECT , (String)null );
if (dialect != null){
- String dialectShort = helper.getShortDialectName(dialect);
- dialectNameCombo.setText( dialectShort != null ? dialectShort : dialect );
+ dialectNameCombo.setText( helper.getShortDialectName(dialect) );
}
namingStrategyClassNameText.setText( configuration.getAttribute( IConsoleConfigurationLaunchConstants.NAMING_STRATEGY, "" ) ); //$NON-NLS-1$
entityResolverClassNameText.setText( configuration.getAttribute( IConsoleConfigurationLaunchConstants.ENTITY_RESOLVER, "" ) ); //$NON-NLS-1$
@@ -102,11 +101,7 @@
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
String dialect = nonEmptyTrimOrNull( dialectNameCombo.getText() );
- if ( dialect != null ) {
- String dialectFull = helper.getDialectClass(dialect);
- /*It can be unknown dialect*/
- if (dialectFull != null) dialect = dialectFull;
- }
+ dialect = helper.getDialectClass(dialect);
configuration.setAttribute( IConsoleConfigurationLaunchConstants.DIALECT, nonEmptyTrimOrNull( dialect ) );
configuration.setAttribute( IConsoleConfigurationLaunchConstants.NAMING_STRATEGY, nonEmptyTrimOrNull( namingStrategyClassNameText ) );
17 years, 5 months
JBoss Tools SVN: r11664 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: commands and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-11-11 06:19:01 -0500 (Tue, 11 Nov 2008)
New Revision: 11664
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/PagesCompoundCommand.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3035
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-11-11 11:18:38 UTC (rev 11663)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-11-11 11:19:01 UTC (rev 11664)
@@ -96,6 +96,10 @@
import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper;
import org.jboss.tools.seam.ui.pages.SeamUIPagesMessages;
import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin;
+import org.jboss.tools.seam.ui.pages.editor.actions.PagesCopyAction;
+import org.jboss.tools.seam.ui.pages.editor.actions.PagesCutAction;
+import org.jboss.tools.seam.ui.pages.editor.actions.PagesDeleteAction;
+import org.jboss.tools.seam.ui.pages.editor.actions.PagesPasteAction;
import org.jboss.tools.seam.ui.pages.editor.dnd.FileTransferDropTargetListener;
import org.jboss.tools.seam.ui.pages.editor.dnd.PagesTemplateTransferDropTargetListener;
import org.jboss.tools.seam.ui.pages.editor.dnd.XModelTransferDropTargetListener;
@@ -457,10 +461,10 @@
}
protected void createActions() {
-// register(new JSFDeleteAction(this), true, false);
-// register(new JSFCopyAction(this), true, false);
-// register(new JSFPasteAction(this), true, false);
-// register(new JSFCutAction(this), true, false);
+ register(new PagesDeleteAction(this), true, false);
+ register(new PagesCopyAction(this), true, false);
+ register(new PagesPasteAction(this), true, false);
+ register(new PagesCutAction(this), true, false);
//register(new MyPrintAction(this), false, true);
register(new DiagramAlignmentAction(this, PositionConstants.LEFT), true, false);
register(new DiagramAlignmentAction(this, PositionConstants.RIGHT), true, false);
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/PagesCompoundCommand.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/PagesCompoundCommand.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/PagesCompoundCommand.java 2008-11-11 11:19:01 UTC (rev 11664)
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.pages.editor.commands;
+
+import java.util.*;
+
+import org.jboss.tools.common.model.ui.dnd.DnDUtil;
+import org.eclipse.gef.commands.Command;
+
+import org.jboss.tools.common.meta.action.XAction;
+import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.model.XModelObject;
+
+public class PagesCompoundCommand extends Command {
+ private List<Object> elements = new ArrayList<Object>();
+ private String actionName;
+
+ public PagesCompoundCommand(String actionName) {
+ super();
+ this.actionName = actionName;
+ }
+
+ public boolean canExecute() {
+ if(elements.size() > 0){
+ XModelObject[] objects = (XModelObject[])elements.toArray(new XModelObject[]{});
+ XModelObject object= objects[0];
+ if(elements.size() == 1) objects = null;
+ XAction action = DnDUtil.getEnabledAction(object, objects, actionName);
+ if(action != null) return true;
+ }
+ return false;
+ }
+
+ public boolean canUndo() {
+ return false;
+ }
+
+ public void add(Object element){
+ elements.add(element);
+ }
+
+ public void execute() {
+ XModelObject[] objects = (XModelObject[])elements.toArray(new XModelObject[]{});
+ XModelObject object= objects[0];
+ if(elements.size() == 1) objects = null;
+ XActionInvoker.invoke(actionName, object, objects, null);
+ }
+}
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/PagesCompoundCommand.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 5 months
JBoss Tools SVN: r11663 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: actions and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-11-11 06:18:38 -0500 (Tue, 11 Nov 2008)
New Revision: 11663
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCommandFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCopyAction.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCutAction.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCutRetargetAction.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesDeleteAction.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesPasteAction.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3035
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCommandFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCommandFactory.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCommandFactory.java 2008-11-11 11:18:38 UTC (rev 11663)
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.pages.editor.actions;
+
+import java.util.List;
+import org.eclipse.gef.commands.Command;
+import org.jboss.tools.seam.ui.pages.editor.commands.PagesCompoundCommand;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
+import org.jboss.tools.seam.ui.pages.editor.edit.LinkEditPart;
+import org.jboss.tools.seam.ui.pages.editor.edit.PagesEditPart;
+
+public class PagesCommandFactory {
+
+ private static Command createCommand(List objects, String commandPath) {
+ Object source = null;
+ if (objects.isEmpty())
+ return null;
+ if ((objects.get(0) instanceof PagesEditPart) || (objects.get(0) instanceof LinkEditPart)){
+ PagesCompoundCommand compoundCmd = new PagesCompoundCommand(commandPath);
+ for (int i = 0; i < objects.size(); i++) {
+ source = null;
+ if(objects.get(i) instanceof PagesEditPart) source = ((PagesElement)((PagesEditPart)objects.get(i)).getModel()).getData();
+ else if(objects.get(i) instanceof LinkEditPart) source = ((PagesElement)((LinkEditPart)objects.get(i)).getModel()).getData();
+ if(source != null)compoundCmd.add(source);
+ }
+ return compoundCmd;
+ } else return null;
+ }
+
+ public static Command createDeleteCommand(List objects) {
+ return createCommand(objects, "DeleteActions.Delete");
+ }
+
+ public static Command createCopyCommand(List objects) {
+ return createCommand(objects, "CopyActions.Copy");
+ }
+
+ public static Command createCutCommand(List objects) {
+ return createCommand(objects, "CopyActions.Cut");
+ }
+
+ public static Command createPasteCommand(List objects) {
+ return createCommand(objects, "CopyActions.Paste");
+ }
+
+}
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCommandFactory.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCopyAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCopyAction.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCopyAction.java 2008-11-11 11:18:38 UTC (rev 11663)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.pages.editor.actions;
+
+import java.util.List;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.gef.commands.Command;
+import org.jboss.tools.common.gef.action.DiagramCopyAction;
+
+final public class PagesCopyAction extends DiagramCopyAction {
+
+ public PagesCopyAction(IWorkbenchPart editor) {
+ super(editor);
+ }
+
+ protected Command createCommand(List objects) {
+ return PagesCommandFactory.createCopyCommand(objects);
+ }
+
+}
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCopyAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCutAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCutAction.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCutAction.java 2008-11-11 11:18:38 UTC (rev 11663)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.pages.editor.actions;
+
+import java.util.List;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.gef.commands.Command;
+import org.jboss.tools.common.gef.action.DiagramCutAction;
+
+final public class PagesCutAction extends DiagramCutAction {
+
+ public PagesCutAction(IWorkbenchPart editor) {
+ super(editor);
+ }
+
+ protected Command createCommand(List objects) {
+ return PagesCommandFactory.createCutCommand(objects);
+ }
+
+}
+
+
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCutAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCutRetargetAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCutRetargetAction.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCutRetargetAction.java 2008-11-11 11:18:38 UTC (rev 11663)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.pages.editor.actions;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.internal.WorkbenchImages;
+import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.actions.RetargetAction;
+
+/**
+ * @author Eric Bordeau
+ */
+public class PagesCutRetargetAction extends RetargetAction {
+
+ /**
+ * Constructs a new CopyRetargetAction with the default ID, label and image.
+ */
+ public PagesCutRetargetAction() {
+ super(ActionFactory.CUT.getId(), "&Copy"/* GEFMessages.CopyAction_Label */);
+ setImageDescriptor(getImageDescriptor(ISharedImages.IMG_TOOL_CUT));
+ setHoverImageDescriptor(getImageDescriptor(ISharedImages.IMG_TOOL_CUT));
+ setDisabledImageDescriptor(getImageDescriptor(ISharedImages.IMG_TOOL_CUT_DISABLED));
+ }
+
+ private ImageDescriptor getImageDescriptor(String symbolicName) {
+ return WorkbenchImages.getImageDescriptor(symbolicName);
+ }
+
+}
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCutRetargetAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesDeleteAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesDeleteAction.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesDeleteAction.java 2008-11-11 11:18:38 UTC (rev 11663)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.pages.editor.actions;
+
+import java.util.List;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.gef.commands.Command;
+import org.jboss.tools.common.gef.action.DiagramDeleteAction;
+
+final public class PagesDeleteAction extends DiagramDeleteAction {
+
+ public PagesDeleteAction(IWorkbenchPart editor) {
+ super(editor);
+ }
+
+ protected Command createCommand(List objects) {
+ return PagesCommandFactory.createDeleteCommand(objects);
+ }
+
+}
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesDeleteAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesPasteAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesPasteAction.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesPasteAction.java 2008-11-11 11:18:38 UTC (rev 11663)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.pages.editor.actions;
+
+import java.util.List;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.gef.commands.Command;
+import org.jboss.tools.common.gef.action.DiagramPasteAction;
+
+final public class PagesPasteAction extends DiagramPasteAction {
+
+ public PagesPasteAction(IWorkbenchPart editor) {
+ super(editor);
+ }
+
+ protected Command createCommand(List objects) {
+ return PagesCommandFactory.createPasteCommand(objects);
+ }
+
+}
+
+
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesPasteAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 5 months
JBoss Tools SVN: r11662 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-11-11 06:06:29 -0500 (Tue, 11 Nov 2008)
New Revision: 11662
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2740
dialect option added.
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-11-11 11:06:25 UTC (rev 11661)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-11-11 11:06:29 UTC (rev 11662)
@@ -251,38 +251,13 @@
private String createConsoleConfiguration(){
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
-
String dialect = determineDialect();
- IPath propPath = null;
- if (dialect != null) {
- OutputStream out = null;
- try{
- String propName = HibernateConsoleMessages.AddConfigurationAction_hibernate + ".properties";
- propPath = HibernateJptUIPlugin.getDefault().getStateLocation().append(propName);
- File file = propPath.toFile();
- file.createNewFile();
- out = new FileOutputStream(file);
- Properties p = new Properties();
- p.setProperty(BasicHibernateProperties.HIBERNATE_DIALECT, determineDialect());
- p.store(out, null);
- } catch(IOException e){
-
- } finally {
- if (out != null){
- try {
- out.close();
- } catch (IOException e) {
- }
- }
- }
- }
-
String ccName = launchManager.generateUniqueLaunchConfigurationNameFrom(HibernateConsoleMessages.AddConfigurationAction_hibernate);
ConsoleConfigurationPreferences prefs = new EclipseConsoleConfigurationPreferences(ccName,
ConfigurationMode.JPA, jpaProject.getName(), true,
- null, null, propPath,
+ null, null, null,
new IPath[0], new IPath[0], null, null,
- getConnectionProfileName(), true);
+ getConnectionProfileName(), dialect);
ConsoleConfiguration cc = new ConsoleConfiguration(prefs);
KnownConfigurations.getInstance().addConfiguration(cc, false);
17 years, 5 months
JBoss Tools SVN: r11661 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse: launch and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-11-11 06:06:25 -0500 (Tue, 11 Nov 2008)
New Revision: 11661
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/IConsoleConfigurationLaunchConstants.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2740
dialect option added.
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java 2008-11-11 11:06:19 UTC (rev 11660)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java 2008-11-11 11:06:25 UTC (rev 11661)
@@ -62,8 +62,8 @@
ConfigurationMode cmode, String projectName, boolean useProjectClasspath,
String entityResolver, IPath cfgFile, IPath propertyFilename,
IPath[] mappings, IPath[] classpaths, String persistenceUnitName, String namingStrategy,
- String connectionProfile, boolean connectionProfileFlag) {
- super(configName, cmode, projectName, useProjectClasspath, entityResolver, persistenceUnitName, namingStrategy, connectionProfile);
+ String connectionProfile, String dialectName) {
+ super(configName, cmode, projectName, useProjectClasspath, entityResolver, persistenceUnitName, namingStrategy, connectionProfile, dialectName);
this.cfgFile = cfgFile;
this.propertyFilename = propertyFilename;
this.mappings = mappings;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2008-11-11 11:06:19 UTC (rev 11660)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2008-11-11 11:06:25 UTC (rev 11661)
@@ -15,11 +15,14 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.datatools.connectivity.IConnectionProfile;
+import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.osgi.util.NLS;
import org.hibernate.console.HibernateConsoleRuntimeException;
import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
import org.hibernate.eclipse.console.utils.ClassLoaderHelper;
+import org.hibernate.eclipse.console.utils.DriverClassHelpers;
import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants;
import org.w3c.dom.Element;
@@ -160,5 +163,16 @@
public void writeStateTo(Element node) {
throw new IllegalStateException(HibernateConsoleMessages.EclipseLaunchConsoleConfigurationPreferences_cannot_write_to_xml);
}
+
+ public String getDialectName() {
+ String dialect = getAttribute( IConsoleConfigurationLaunchConstants.DIALECT, null );
+ // determine dialect when connection profile is used
+ if (dialect == null && getConnectionProfileName() != null) {
+ IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName());
+ String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass");
+ dialect = new DriverClassHelpers().getDialect(driver);
+ }
+ return dialect;
+ }
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java 2008-11-11 11:06:19 UTC (rev 11660)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java 2008-11-11 11:06:25 UTC (rev 11661)
@@ -10,7 +10,9 @@
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Text;
@@ -18,13 +20,15 @@
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.DialogSelectionHelper;
+import org.hibernate.eclipse.console.utils.DriverClassHelpers;
import org.xml.sax.EntityResolver;
public class ConsoleConfigurationOptionsTab extends ConsoleConfigurationTab {
-
+ private Combo dialectNameCombo;
private Text entityResolverClassNameText;
private Text namingStrategyClassNameText;
+ private DriverClassHelpers helper = new DriverClassHelpers();
public void createControl(Composite parent) {
Font font = parent.getFont();
@@ -35,10 +39,22 @@
comp.setLayout(layout);
comp.setFont(font);
+ createDialectNameCombo( comp );
createNamingStrategyClassNameEditor( comp );
createEntityResolverClassNameEditor( comp );
}
+
+ private void createDialectNameCombo(Composite parent) {
+ Group group = createGroup( parent, HibernateConsoleMessages.NewConfigurationWizardPage_database_dialect );
+
+ dialectNameCombo = new Combo(group, SWT.NONE);
+ dialectNameCombo.setItems(helper.getDialectNames());
+ Font font=parent.getFont();
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ dialectNameCombo.setLayoutData(gd);
+ dialectNameCombo.setFont(font);
+ }
private void createNamingStrategyClassNameEditor(Composite parent) {
Group group = createGroup( parent, HibernateConsoleMessages.ConsoleConfigurationOptionsTab_naming_strategy );
@@ -71,6 +87,11 @@
public void initializeFrom(ILaunchConfiguration configuration) {
try {
+ String dialect = configuration.getAttribute( IConsoleConfigurationLaunchConstants.DIALECT , (String)null );
+ if (dialect != null){
+ String dialectShort = helper.getShortDialectName(dialect);
+ dialectNameCombo.setText( dialectShort != null ? dialectShort : dialect );
+ }
namingStrategyClassNameText.setText( configuration.getAttribute( IConsoleConfigurationLaunchConstants.NAMING_STRATEGY, "" ) ); //$NON-NLS-1$
entityResolverClassNameText.setText( configuration.getAttribute( IConsoleConfigurationLaunchConstants.ENTITY_RESOLVER, "" ) ); //$NON-NLS-1$
}
@@ -80,6 +101,14 @@
}
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
+ String dialect = nonEmptyTrimOrNull( dialectNameCombo.getText() );
+ if ( dialect != null ) {
+ String dialectFull = helper.getDialectClass(dialect);
+ /*It can be unknown dialect*/
+ if (dialectFull != null) dialect = dialectFull;
+ }
+
+ configuration.setAttribute( IConsoleConfigurationLaunchConstants.DIALECT, nonEmptyTrimOrNull( dialect ) );
configuration.setAttribute( IConsoleConfigurationLaunchConstants.NAMING_STRATEGY, nonEmptyTrimOrNull( namingStrategyClassNameText ) );
configuration.setAttribute( IConsoleConfigurationLaunchConstants.ENTITY_RESOLVER, nonEmptyTrimOrNull( entityResolverClassNameText ) );
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/IConsoleConfigurationLaunchConstants.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/IConsoleConfigurationLaunchConstants.java 2008-11-11 11:06:19 UTC (rev 11660)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/IConsoleConfigurationLaunchConstants.java 2008-11-11 11:06:25 UTC (rev 11661)
@@ -5,6 +5,7 @@
public interface IConsoleConfigurationLaunchConstants {
public static final String ID = "org.hibernate.eclipse.launch"; //$NON-NLS-1$
+ public static final String DIALECT = ID + "DIALECT"; //$NON-NLS-1$
public static final String NAMING_STRATEGY = ID + "NAMING_STRATEGY"; //$NON-NLS-1$
public static final String ENTITY_RESOLVER = ID + "ENTITY_RESOLVER"; //$NON-NLS-1$
public static final String PROPERTY_FILE = ID + ".PROPERTY_FILE"; //$NON-NLS-1$
17 years, 5 months
JBoss Tools SVN: r11660 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-11-11 06:06:19 -0500 (Tue, 11 Nov 2008)
New Revision: 11660
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2740
dialect option added.
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2008-11-11 11:06:14 UTC (rev 11659)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2008-11-11 11:06:19 UTC (rev 11660)
@@ -111,6 +111,14 @@
return null;
}
+ /* (non-Javadoc)
+ * @see org.hibernate.console.preferences.ConsoleConfigurationPreferences#getDialectName()
+ */
+ public String getDialectName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java 2008-11-11 11:06:14 UTC (rev 11659)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java 2008-11-11 11:06:19 UTC (rev 11660)
@@ -134,6 +134,11 @@
return null;
}
+ public String getDialectName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
};
ConsoleConfigurationPreferences preferences2 = new ConsoleConfigurationPreferences() {
@@ -213,6 +218,11 @@
return null;
}
+ public String getDialectName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
};
ConsoleConfiguration configuration = new ConsoleConfiguration(preferences);
17 years, 5 months