JBoss Tools SVN: r3456 - in trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/myFaces: MyFacesKickStart/WebContent/WEB-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-05 09:46:20 -0400 (Wed, 05 Sep 2007)
New Revision: 3456
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/myFaces/MyFacesBlank/WebContent/WEB-INF/faces-config.xml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/myFaces/MyFacesKickStart/WebContent/WEB-INF/faces-config.xml
Log:
JBIDE-542
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/myFaces/MyFacesBlank/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/myFaces/MyFacesBlank/WebContent/WEB-INF/faces-config.xml 2007-09-05 13:29:17 UTC (rev 3455)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/myFaces/MyFacesBlank/WebContent/WEB-INF/faces-config.xml 2007-09-05 13:46:20 UTC (rev 3456)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE faces-config PUBLIC
"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
<faces-config>
Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/myFaces/MyFacesKickStart/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/myFaces/MyFacesKickStart/WebContent/WEB-INF/faces-config.xml 2007-09-05 13:29:17 UTC (rev 3455)
+++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/myFaces/MyFacesKickStart/WebContent/WEB-INF/faces-config.xml 2007-09-05 13:46:20 UTC (rev 3456)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE faces-config PUBLIC
"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
<faces-config>
16 years, 8 months
JBoss Tools SVN: r3455 - trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-05 09:29:17 -0400 (Wed, 05 Sep 2007)
New Revision: 3455
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java
Log:
JBIDE-532
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java 2007-09-05 12:47:18 UTC (rev 3454)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/path/CreateActionForwardSupport.java 2007-09-05 13:29:17 UTC (rev 3455)
@@ -70,7 +70,10 @@
private void resetTiles() {
tiles.clear();
- tiles.addAll(StrutsProcessStructureHelper.instance.getTiles(getTarget()));
+ Set<String> tilePaths = StrutsProcessStructureHelper.instance.getTiles(getTarget());
+ for (String s : tilePaths) {
+ tiles.add(s.replace("#", "/"));
+ }
p.put("tiles", tiles);
}
16 years, 8 months
JBoss Tools SVN: r3454 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-09-05 08:47:18 -0400 (Wed, 05 Sep 2007)
New Revision: 3454
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-744, scrolling for source selection event was added
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-09-05 12:47:03 UTC (rev 3453)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2007-09-05 12:47:18 UTC (rev 3454)
@@ -14,6 +14,7 @@
import java.util.regex.Pattern;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
@@ -95,6 +96,10 @@
private nsIDOMElement lastSelectedElement;
private int lastResizerConstrains;
+ /**
+ * Scroll selection into view flag
+ */
+ private boolean scrollRegtangleFlag = false;
/**
* @param parent
@@ -275,6 +280,8 @@
}
if (getLastSelectedElement() != null) {
+ scrollRegtangleFlag = scroll && element != null;
+
if(checkVisability(getLastSelectedElement())){
if((getLastSelectedElement().getAttribute(VPEFLASHERCOLORATTRIBUTE)==null)||
@@ -301,6 +308,10 @@
} else if (element != null) {
+ if (scroll) {
+ scrollToElement(element);
+ scrollRegtangleFlag = true;
+ }
if(checkVisability(element)){
@@ -454,10 +465,11 @@
// ((nsIBaseWindow)getWebBrowser().queryInterface(nsIBaseWindow.NS_IBASEWINDOW_IID)).repaint(false);
if (getIFlasher() != null && getLastSelectedElement() != null) {
-// if (scrollRegtangleFlag) {
-// scrollRegtangleFlag = false;
-// selectionController.scrollSelectionIntoView();
-// }
+ if (scrollRegtangleFlag) {
+ scrollRegtangleFlag = false;
+
+ scrollToElement(getLastSelectedElement());
+ }
//checks visability of element
if(checkVisability(getLastSelectedElement())){
@@ -482,6 +494,16 @@
}
}
}
+ /**
+ * Scrools viiew to some elements
+ * @param element -element to which we should scroll
+ */
+ private void scrollToElement(nsIDOMElement element){
+ nsIDOMWindow domWindow = getWebBrowser().getContentDOMWindow();
+ // get element positions on visual page
+ Rectangle rect=XulRunnerVpeUtils.getElementBounds(element);
+ domWindow.scrollTo(rect.x, rect.y);
+ }
}
16 years, 8 months
JBoss Tools SVN: r3453 - in branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: mozilla and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-09-05 08:47:03 -0400 (Wed, 05 Sep 2007)
New Revision: 3453
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/mozilla/MozillaBaseEventListener.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-744, scrolling for source selection event was added
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-09-05 09:57:51 UTC (rev 3452)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-09-05 12:47:03 UTC (rev 3453)
@@ -140,14 +140,10 @@
import org.mozilla.interfaces.nsIDOMMouseEvent;
import org.mozilla.interfaces.nsIDOMMutationEvent;
import org.mozilla.interfaces.nsIDOMNode;
-import org.mozilla.interfaces.nsIDragSession;
import org.mozilla.interfaces.nsISelection;
import org.mozilla.interfaces.nsISelectionListener;
import org.mozilla.interfaces.nsISupports;
-import org.mozilla.interfaces.nsISupportsArray;
-import org.mozilla.interfaces.nsITransferable;
import org.mozilla.xpcom.Mozilla;
-import org.mozilla.xpcom.XPCOMException;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
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-09-05 09:57:51 UTC (rev 3452)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaBaseEventListener.java 2007-09-05 12:47:03 UTC (rev 3453)
@@ -29,16 +29,7 @@
// TODO Max Areshkau delete this reference afrer DnD had been added
// createCOMInterfaces();
}
- // TODO Max Areshkau delete this reference afrer DnD had been added
-// VpeDnD getLocalDnD() {
-// return dnd;
-// }
- // TODO Max Areshkau delete this reference afrer DnD had been added
-// XPCOMObject getDropListener() {
-// return dropListener;
-// }
-
void createCOMInterfaces() {
// TODO Max Areshkau delete this reference afrer DnD had been added
// // VpeDnD
@@ -56,111 +47,7 @@
// TODO Max Areshkau delete this reference afrer DnD had been added
// dnd = getDnD();
}
-
- // TODO Max Areshkau delete this reference afrer DnD had been added
-// void disposeCOMInterfaces() {
-// if (dropListener != null) {
-// dropListener.dispose();
-// dropListener = null;
-// }
-// }
-
- // TODO Max Areshkau delete this reference afrer DnD had been added
- // nsISupports implementation
-// int QueryInterface(int riid, int ppvObject) {
-// if (riid == 0 || ppvObject == 0) {
-// return XPCOM.NS_ERROR_NO_INTERFACE;
-// }
-// nsID guid = new nsID();
-// XPCOM.memmove(guid, riid, nsID.sizeof);
-//
-// if (MozillaDebug.printVisualNoInterface) {
-// System.out.println("DomEventListener - NO INTERFACE: " + guid.ToString());
-// }
-// XPCOM.memmove(ppvObject, new int[] {0}, 4);
-// return XPCOM.NS_ERROR_NO_INTERFACE;
-// }
-
- // TODO Max Areshkau delete this reference afrer DnD had been added
-// int AddRef() {
-// refCount++;
-// return refCount;
-// }
-
- // TODO Max Areshkau delete this reference afrer DnD had been added
-// int Release() {
-// refCount--;
-// if (refCount == 0) {
-// disposeCOMInterfaces();
-// }
-// return refCount;
-// }
- // TODO Max Areshkau delete this reference afrer DnD had been added
-// VpeDnD getDnD() {
-// int[] result = new int[] {0};
-// int rc = XPCOM.NS_GetComponentManager(result);
-// if (rc != XPCOM.NS_OK) {
-// VpePlugin.getPluginLog().logError("(DND) GetComponentManager error " + rc);
-// }
-// if (result[0] == 0) {
-// VpePlugin.getPluginLog().logError("(DND) GetComponentManager error NO_INTERFACE");
-// }
-//
-// nsIComponentManager componentManager = new nsIComponentManager(result[0]);
-// result[0] = 0;
-// rc = componentManager.CreateInstance(XPCOM.VPE_DND_CID, 0, VpeDnD.VPE_DND_IID, result);
-// if (rc != XPCOM.NS_OK) {
-// VpePlugin.getPluginLog().logError("(DND) Create instance error " + rc);
-// }
-// if (result[0] == 0) {
-// VpePlugin.getPluginLog().logError("(DND) Create instance error NO_INTERFACE");
-// }
-// componentManager.Release();
-//
-// return new VpeDnD(result[0]);
-// }
-
- // TODO Max Areshkau delete this reference afrer DnD had been added
- // IDropListener
-// int CanDrag(int aDragEvent, int _retval, int aNode, int offset) {
-// XPCOM.memmove(_retval, new int[] {0}, 4);
-// XPCOM.memmove(aNode, new int[] {0}, 4);
-// XPCOM.memmove(offset, new int[] {0}, 4);
-// return XPCOM.NS_OK;
-// }
-
- // TODO Max Areshkau delete this reference afrer DnD had been added
-// int CanDrop(int aDropEvent, int _retval, int aNode, int offset) {
-// XPCOM.memmove(_retval, new int[] {0}, 4);
-// XPCOM.memmove(aNode, new int[] {0}, 4);
-// XPCOM.memmove(offset, new int[] {0}, 4);
-// return XPCOM.NS_OK;
-// }
-
- // TODO Max Areshkau delete this reference afrer DnD had been added
-// int Drop(int aDropEvent, int aNode, int offset) {
-// XPCOM.memmove(aNode, new int[] {0}, 4);
-// XPCOM.memmove(offset, new int[] {0}, 4);
-// return XPCOM.NS_OK;
-// }
-
- // TODO Max Areshkau delete this reference afrer DnD had been added
-// int CanDropExternal(int aDropEvent, int aFlavor, int aTransData, int _retval, int aNode, int offset) {
-// XPCOM.memmove(_retval, new int[] {0}, 4);
-// XPCOM.memmove(aNode, new int[] {0}, 4);
-// XPCOM.memmove(offset, new int[] {0}, 4);
-// return XPCOM.NS_OK;
-// }
-
- // TODO Max Areshkau delete this reference afrer DnD had been added
-// int DropExternal(int aDropEvent, int aFlavor, int aTransData, int aNode, int offset) {
-// XPCOM.memmove(aNode, new int[] {0}, 4);
-// XPCOM.memmove(offset, new int[] {0}, 4);
-//// return XPCOM.NS_OK;
-// return XPCOM.NS_ERROR_ABORT;
-// }
-
/* (non-Javadoc)
* @see org.mozilla.interfaces.nsIClipboardDragDropHooks#allowDrop(org.mozilla.interfaces.nsIDOMEvent, org.mozilla.interfaces.nsIDragSession)
*/
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2007-09-05 09:57:51 UTC (rev 3452)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2007-09-05 12:47:03 UTC (rev 3453)
@@ -344,15 +344,12 @@
nsIDOMMouseEvent mouseEvent;
mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
getEditorDomEventListener().mouseDown(mouseEvent);
-// domEvent.stopPropagation();
-// domEvent.preventDefault();
+
} else if(MOUSEUPEVENTTYPE.equals(domEvent.getType())) {
nsIDOMMouseEvent mouseEvent;
mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
getEditorDomEventListener().mouseUp(mouseEvent);
-// domEvent.stopPropagation();
-// domEvent.preventDefault();
} else if(CLICKEVENTTYPE.equals(domEvent.getType())) {
nsIDOMMouseEvent mouseEvent;
16 years, 8 months
JBoss Tools SVN: r3452 - trunk/documentation/qa.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-05 05:57:51 -0400 (Wed, 05 Sep 2007)
New Revision: 3452
Added:
trunk/documentation/qa/RHDS-Testcases.doc
Log:
Copied: trunk/documentation/qa/RHDS-Testcases.doc (from rev 3451, trunk/documentation/qa/RHDS Testcases.doc)
===================================================================
(Binary files differ)
16 years, 8 months
JBoss Tools SVN: r3451 - trunk/documentation/qa.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-05 05:55:07 -0400 (Wed, 05 Sep 2007)
New Revision: 3451
Added:
trunk/documentation/qa/RHDS Testcases.doc
Log:
Initial QA Testcases
Added: trunk/documentation/qa/RHDS Testcases.doc
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/qa/RHDS Testcases.doc
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 8 months
JBoss Tools SVN: r3449 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor.
by jbosstools-commits＠lists.jboss.org
Author: ayukhovich
Date: 2007-09-05 03:22:28 -0400 (Wed, 05 Sep 2007)
New Revision: 3449
Added:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeUtils.java
Removed:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/DOMElementUtils.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/ElementPositionAndDimention.java
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeResizer.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-742
Restoring functionality of resizing
Deleted: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/DOMElementUtils.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/DOMElementUtils.java 2007-09-05 07:22:11 UTC (rev 3448)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/DOMElementUtils.java 2007-09-05 07:22:28 UTC (rev 3449)
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.vpe.xulrunner.editor;
-
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNSHTMLElement;
-
-/**
- * @author A. Yukhovich
- */
-public class DOMElementUtils {
-
- /**
- * @param domElement
- * @return
- */
- static public ElementPositionAndDimention getElementPositionAndDimention(nsIDOMElement domElement) {
- ElementPositionAndDimention elementPositionAndDimention = new ElementPositionAndDimention();
-
- nsIDOMNSHTMLElement nsElement = (nsIDOMNSHTMLElement) domElement.queryInterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID);
-
- if (nsElement != null) {
- elementPositionAndDimention.setWidth(nsElement.getOffsetWidth());
- elementPositionAndDimention.setHeight(nsElement.getOffsetHeight());
- elementPositionAndDimention.setTop(nsElement.getOffsetTop());
- elementPositionAndDimention.setLeft(nsElement.getOffsetLeft());
- }
-
- return elementPositionAndDimention;
- }
-}
Deleted: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/ElementPositionAndDimention.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/ElementPositionAndDimention.java 2007-09-05 07:22:11 UTC (rev 3448)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/ElementPositionAndDimention.java 2007-09-05 07:22:28 UTC (rev 3449)
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.vpe.xulrunner.editor;
-
-/**
- * @author A. Yukhovich
- *
- */
-public class ElementPositionAndDimention {
- private int top;
- private int left;
- private int height;
- private int width;
-
- private int borderLeft;
- private int borderTop;
- private int marginTop;
- private int marginLeft;
-
- /**
- * @return the top
- */
- public int getTop() {
- return top;
- }
- /**
- * @param top the top to set
- */
- public void setTop(int top) {
- this.top = top;
- }
- /**
- * @return the left
- */
- public int getLeft() {
- return left;
- }
- /**
- * @param left the left to set
- */
- public void setLeft(int left) {
- this.left = left;
- }
- /**
- * @return the height
- */
- public int getHeight() {
- return height;
- }
- /**
- * @param height the height to set
- */
- public void setHeight(int height) {
- this.height = height;
- }
- /**
- * @return the width
- */
- public int getWidth() {
- return width;
- }
- /**
- * @param width the width to set
- */
- public void setWidth(int width) {
- this.width = width;
- }
- /**
- * @return the borderLeft
- */
- public int getBorderLeft() {
- return borderLeft;
- }
- /**
- * @param borderLeft the borderLeft to set
- */
- public void setBorderLeft(int borderLeft) {
- this.borderLeft = borderLeft;
- }
- /**
- * @return the borderTop
- */
- public int getBorderTop() {
- return borderTop;
- }
- /**
- * @param borderTop the borderTop to set
- */
- public void setBorderTop(int borderTop) {
- this.borderTop = borderTop;
- }
- /**
- * @return the marginTop
- */
- public int getMarginTop() {
- return marginTop;
- }
- /**
- * @param marginTop the marginTop to set
- */
- public void setMarginTop(int marginTop) {
- this.marginTop = marginTop;
- }
- /**
- * @return the marginLeft
- */
- public int getMarginLeft() {
- return marginLeft;
- }
- /**
- * @param marginLeft the marginLeft to set
- */
- public void setMarginLeft(int marginLeft) {
- this.marginLeft = marginLeft;
- }
-
-}
-
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeResizer.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeResizer.java 2007-09-05 07:22:11 UTC (rev 3448)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeResizer.java 2007-09-05 07:22:28 UTC (rev 3449)
@@ -13,7 +13,7 @@
import java.util.ArrayList;
-
+import org.eclipse.swt.graphics.Rectangle;
import org.mozilla.interfaces.nsIDOMCSSStyleDeclaration;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
@@ -93,7 +93,7 @@
private nsIDOMElement activeHandle;
- private ElementPositionAndDimention elementPositionAndDimention;
+ private Rectangle elementBounds;
/** resizer marker top-left */
private nsIDOMElement markerTopLeft = null;
@@ -148,12 +148,12 @@
System.out.println("XulRunnerVpeResizer.show for element: " + resizingObject.getNodeName() );
- elementPositionAndDimention = DOMElementUtils.getElementPositionAndDimention(domElement);
+ elementBounds = XulRunnerVpeUtils.getElementBounds(domElement);
- if ((elementPositionAndDimention.getWidth() <= 0) ||
- (elementPositionAndDimention.getWidth() > MAX_SIZE) ||
- (elementPositionAndDimention.getHeight() <= 0) ||
- (elementPositionAndDimention.getHeight() > MAX_SIZE)) return;
+ if ((elementBounds.width <= 0) ||
+ (elementBounds.width > MAX_SIZE) ||
+ (elementBounds.height <= 0) ||
+ (elementBounds.height > MAX_SIZE)) return;
nsIDOMElement bodyElement = getRootElement();
@@ -219,7 +219,7 @@
resizingShadow = createShadow(bodyElement, resizingObject);
- setShadowPosition(resizingShadow, elementPositionAndDimention.getLeft(), elementPositionAndDimention.getTop());
+ setShadowPosition(resizingShadow, elementBounds.x, elementBounds.y);
}
@@ -492,10 +492,10 @@
resizingShadow.removeAttribute(XulRunnerConstants.HTML_ATTR_CLASS);
// position it
- setShadowPosition(resizingShadow, elementPositionAndDimention.getLeft(), elementPositionAndDimention.getTop());
+ setShadowPosition(resizingShadow, elementBounds.x, elementBounds.y);
- setStylePropertyPixels(resizingShadow, XulRunnerConstants.HTML_ATTR_WIDTH, elementPositionAndDimention.getWidth() );
- setStylePropertyPixels(resizingShadow, XulRunnerConstants.HTML_ATTR_HEIGHT, elementPositionAndDimention.getTop() );
+ setStylePropertyPixels(resizingShadow, XulRunnerConstants.HTML_ATTR_WIDTH, elementBounds.width );
+ setStylePropertyPixels(resizingShadow, XulRunnerConstants.HTML_ATTR_HEIGHT, elementBounds.height );
if (mouseMotionListener != null) {
@@ -539,8 +539,8 @@
* @return
*/
private int getNewResizingX(int aX, int aY) {
- int resized = elementPositionAndDimention.getLeft() + getNewResizingIncrement(aX, aY, COEFFICIENT_TYPE.X) * incrementFactorX;
- int max = elementPositionAndDimention.getLeft() + elementPositionAndDimention.getWidth();
+ int resized = elementBounds.x+ getNewResizingIncrement(aX, aY, COEFFICIENT_TYPE.X) * incrementFactorX;
+ int max = elementBounds.x + elementBounds.width;
return Math.min(resized, max);
}
@@ -551,8 +551,8 @@
* @return
*/
private int getNewResizingY(int aX, int aY) {
- int resized = elementPositionAndDimention.getTop() + getNewResizingIncrement(aX, aY, COEFFICIENT_TYPE.Y) * incrementFactorY;
- int max = elementPositionAndDimention.getTop() + elementPositionAndDimention.getHeight();
+ int resized = elementBounds.y + getNewResizingIncrement(aX, aY, COEFFICIENT_TYPE.Y) * incrementFactorY;
+ int max = elementBounds.y + elementBounds.height;
return Math.min(resized, max);
}
@@ -563,7 +563,7 @@
* @return
*/
private int getNewResizingWidth(int aX, int aY) {
- int resized = elementPositionAndDimention.getWidth() + getNewResizingIncrement(aX, aY, COEFFICIENT_TYPE.WIDTH) * incrementFactorWidth;
+ int resized = elementBounds.width + getNewResizingIncrement(aX, aY, COEFFICIENT_TYPE.WIDTH) * incrementFactorWidth;
return Math.max(resized, 1);
}
@@ -574,7 +574,7 @@
* @return
*/
private int getNewResizingHeight(int aX, int aY) {
- int resized = elementPositionAndDimention.getHeight() + getNewResizingIncrement(aX, aY, COEFFICIENT_TYPE.HEIGHT) * incrementFactorHeight;
+ int resized = elementBounds.height + getNewResizingIncrement(aX, aY, COEFFICIENT_TYPE.HEIGHT) * incrementFactorHeight;
return Math.max(resized, 1);
}
@@ -647,10 +647,10 @@
* Set all positions of resizer's markers
*/
private void setAllResizersPosition() {
- int left = elementPositionAndDimention.getLeft();
- int top = elementPositionAndDimention.getTop();
- int width = elementPositionAndDimention.getWidth();
- int height = elementPositionAndDimention.getHeight();
+ int left = elementBounds.x;
+ int top = elementBounds.y;
+ int width = elementBounds.width;
+ int height = elementBounds.height;
int resizerWidth = 5;
int resizerHeight = 5;
Copied: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeUtils.java (from rev 3444, branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/DOMElementUtils.java)
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeUtils.java (rev 0)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeUtils.java 2007-09-05 07:22:28 UTC (rev 3449)
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.vpe.xulrunner.editor;
+
+import org.eclipse.swt.graphics.Rectangle;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNSHTMLElement;
+import org.mozilla.xpcom.XPCOMException;
+
+/**
+ * @author A. Yukhovich
+ */
+public class XulRunnerVpeUtils {
+
+ /**
+ * @param domElement
+ * @return
+ */
+ static public Rectangle getElementBounds(nsIDOMElement domElement) {
+ try {
+ nsIDOMNSHTMLElement domNSHTMLElement = (nsIDOMNSHTMLElement) domElement.queryInterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID);
+ int offsetLeft = domNSHTMLElement.getOffsetLeft();
+ int offsetTop = domNSHTMLElement.getOffsetTop();
+ int width = domNSHTMLElement.getOffsetWidth();
+ int height = domNSHTMLElement.getOffsetHeight();
+
+ while (true) {
+ try {
+ if (domNSHTMLElement.getOffsetParent() == null) {
+ break;
+ }
+
+ domNSHTMLElement = (nsIDOMNSHTMLElement) domNSHTMLElement.getOffsetParent().queryInterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID);
+ offsetLeft += domNSHTMLElement.getOffsetLeft();
+ offsetTop += domNSHTMLElement.getOffsetTop();
+ } catch (XPCOMException ex) {
+ break;
+ }
+ }
+ return new Rectangle(offsetLeft, offsetTop, width, height);
+
+ } catch (XPCOMException xpcomException) {
+ return new Rectangle(0, 0, 0, 0);
+ }
+ }
+}
16 years, 8 months
JBoss Tools SVN: r3448 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-09-05 03:22:11 -0400 (Wed, 05 Sep 2007)
New Revision: 3448
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java
Log:
code adjustment
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java 2007-09-04 20:33:52 UTC (rev 3447)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java 2007-09-05 07:22:11 UTC (rev 3448)
@@ -55,6 +55,8 @@
nsIDOMNSHTMLElement domNSHTMLElement = (nsIDOMNSHTMLElement) visualNode.queryInterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID);
int offsetLeft=domNSHTMLElement.getOffsetLeft();
int offsetTop =domNSHTMLElement.getOffsetTop();
+ int offsetWidth=domNSHTMLElement.getOffsetWidth();
+ int offsetHeight=domNSHTMLElement.getOffsetHeight();
while(true) {
try{
@@ -71,7 +73,7 @@
}
}
- return new Rectangle(offsetLeft, offsetTop,domNSHTMLElement.getOffsetWidth(),domNSHTMLElement.getOffsetHeight());
+ return new Rectangle(offsetLeft, offsetTop,offsetWidth,offsetHeight);
} catch(XPCOMException xpcomException) {
16 years, 8 months
JBoss Tools SVN: r3447 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-04 16:33:52 -0400 (Tue, 04 Sep 2007)
New Revision: 3447
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-853
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java 2007-09-04 16:55:26 UTC (rev 3446)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/AntCopyUtils.java 2007-09-04 20:33:52 UTC (rev 3447)
@@ -86,7 +86,7 @@
public boolean isIncluded(String file) {
int i = dir.getAbsolutePath().length()+1;
String relatedPath = file.substring(i);
- if(new File(file).isDirectory())return true;
+ //if(new File(file).isDirectory())return true;
for (Pattern pattern : include) {
if(pattern.matcher(relatedPath.replace('\\', '/')).matches() ) {
return !isExcluded(relatedPath);
@@ -147,7 +147,6 @@
destinationFolder.mkdirs();
FileUtils.getFileUtils().copyFile(file, new File(destinationFolder,file.getName()),filterSetCollection,override);
} catch (IOException e) {
- e.printStackTrace();
SeamCorePlugin.getPluginLog().logError(e);
}
}
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-09-04 16:55:26 UTC (rev 3446)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-09-04 20:33:52 UTC (rev 3447)
@@ -148,12 +148,21 @@
.include("index\\.html")
.include("layout")
.include("layout/.*")
+ .include("stylesheet")
.include("stylesheet/.*")
.include("img/.*")
.include("img")
- .exclude(".*/.*\\.ftl");
+ .exclude(".*/.*\\.ftl")
+ .exclude(".*/CVS")
+ .exclude(".*/\\.svn");
+ public static AntCopyUtils.FileSet CVS_SVN = new AntCopyUtils.FileSet()
+ .include(".*")
+ .exclude(".*/CVS")
+ .exclude(".*/\\.svn");
+
public static AntCopyUtils.FileSet JBOOS_WAR_WEBINF_SET = new AntCopyUtils.FileSet()
+ .include("WEB-INF")
.include("WEB-INF/web\\.xml")
.include("WEB-INF/pages\\.xml")
.include("WEB-INF/jboss-web\\.xml")
@@ -385,13 +394,13 @@
IProject ejb = WtpUtils.createEclipseProject(model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME)+"-ejb", monitor); try {
FilterSet filterSet = new FilterSet();
filterSet.addFilter("projectName", project.getName());
- filterSet.addFilter("runtimeName", WtpUtils.getServerRuntimeName(project));
+ filterSet.addFilter("runtimeName", WtpUtils.getServerRuntimeName(project));
-
+ AntCopyUtils.FileSet excludeCvsSvn = new AntCopyUtils.FileSet(CVS_SVN).dir(seamGenResFolder);
AntCopyUtils.copyFilesAndFolders(
new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"ejb"),
- ejb.getLocation().toFile(),
+ ejb.getLocation().toFile(), new AntCopyUtils.FileSetFileFilter(excludeCvsSvn),
new FilterSetCollection(filterSet), true);
// *******************************************************************************************
@@ -443,7 +452,7 @@
// Copy configuration files from template
AntCopyUtils.copyFilesAndFolders(
new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"ear"),
- ear.getLocation().toFile(),
+ ear.getLocation().toFile(), new AntCopyUtils.FileSetFileFilter(excludeCvsSvn),
new FilterSetCollection(filterSet), true);
// Fill ear contents
16 years, 8 months