JBoss Tools SVN: r3426 - 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-03 10:54:05 -0400 (Mon, 03 Sep 2007)
New Revision: 3426
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
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-03 13:59:13 UTC (rev 3425)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2007-09-03 14:54:05 UTC (rev 3426)
@@ -11,6 +11,8 @@
package org.jboss.tools.vpe.xulrunner.editor;
+import java.util.regex.Pattern;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
@@ -20,7 +22,6 @@
import org.jboss.tools.vpe.xulrunner.XulRunnerException;
import org.jboss.tools.vpe.xulrunner.browser.XulRunnerBrowser;
import org.mozilla.interfaces.inIFlasher;
-import org.mozilla.interfaces.nsIBaseWindow;
import org.mozilla.interfaces.nsIClipboardDragDropHookList;
import org.mozilla.interfaces.nsIComponentManager;
import org.mozilla.interfaces.nsIDOMDocument;
@@ -32,15 +33,13 @@
import org.mozilla.interfaces.nsIDocShell;
import org.mozilla.interfaces.nsIDragService;
import org.mozilla.interfaces.nsIDragSession;
-import org.mozilla.interfaces.nsIEditingSession;
import org.mozilla.interfaces.nsIInterfaceRequestor;
import org.mozilla.interfaces.nsISelection;
import org.mozilla.interfaces.nsIServiceManager;
import org.mozilla.interfaces.nsISupports;
import org.mozilla.interfaces.nsITransferable;
-import org.mozilla.interfaces.nsIWebBrowser;
import org.mozilla.xpcom.Mozilla;
-import java.util.regex.Pattern;
+import org.mozilla.xpcom.XPCOMException;
/**
* @author Sergey Vasilyev (svasilyev(a)exadel.com)
@@ -235,9 +234,7 @@
public nsISelection getSelection() {
// try{
- nsIServiceManager serviceManager = Mozilla.getInstance().getServiceManager();
- nsIEditingSession editingSession = (nsIEditingSession) serviceManager.getServiceByContractID
- ("@mozilla.org/editor/editingsession;1", nsIEditingSession.NS_IEDITINGSESSION_IID);
+// nsIServiceManager serviceManager = Mozilla.getInstance().getServiceManager();
nsIDOMWindow domWindow = getWebBrowser().getContentDOMWindow();
nsISelection selection = domWindow.getSelection();
return selection;
@@ -377,11 +374,15 @@
*/
private boolean checkVisability(nsIDOMNode node){
- if(!(node instanceof nsIDOMElement)){
+ nsIDOMElement domElement;
+ try{
- return true;
+ domElement = (nsIDOMElement) node.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+
+ } catch(XPCOMException exception) {
+ //if we can cast it's is invisible elenebt
+ return false;
}
- nsIDOMElement domElement = (nsIDOMElement) node;
//TODO add check not inline styles attribute such as styleclass
String inlineStyle = domElement.getAttribute(STYLE_ATTR);
@@ -398,14 +399,15 @@
*/
private nsIDOMElement findVisbleParentElement(nsIDOMElement element) {
- //TODO Max Areshkau optimize code(do not calculate it each time)
- if(!(element.getParentNode() instanceof nsIDOMElement)) {
-
- return null;
- }
-
- nsIDOMElement parentElement = (nsIDOMElement) element.getParentNode();
+ nsIDOMElement parentElement;
+ try {
+
+ parentElement = (nsIDOMElement) element.getParentNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+ } catch (XPCOMException ex) {
+ // if parent node isn't nsIDOMElement just return null;
+ return null;
+ }
while(parentElement!=null&&!checkVisability(parentElement)) {
if(checkVisability(parentElement)) {
@@ -475,7 +477,6 @@
nsIDOMElement domElement = findVisbleParentElement(getLastSelectedElement());
if(domElement!=null) {
-
getIFlasher().drawElementOutline(domElement);
}
}
16 years, 8 months
JBoss Tools SVN: r3425 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: ayukhovich
Date: 2007-09-03 09:59:13 -0400 (Mon, 03 Sep 2007)
New Revision: 3425
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-623
add functionality for resolve this issue
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-09-03 13:00:22 UTC (rev 3424)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-09-03 13:59:13 UTC (rev 3425)
@@ -20,6 +20,8 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.Path;
@@ -34,6 +36,7 @@
import org.jboss.tools.jst.jsp.preferences.VpePreference;
import org.jboss.tools.vpe.VpeDebug;
import org.jboss.tools.vpe.VpePlugin;
+import org.jboss.tools.vpe.editor.bundle.BundleMap;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.css.CSSReferenceList;
import org.jboss.tools.vpe.editor.css.ResourceReference;
@@ -66,6 +69,10 @@
import org.w3c.dom.Text;
public class VpeVisualDomBuilder extends VpeDomBuilder {
+ /** REGEX_EL */
+ private static final Pattern REGEX_EL = Pattern.compile("[\\$|\\#]\\{.*\\}", Pattern.MULTILINE + Pattern.DOTALL);
+
+
private static final String PSEUDO_ELEMENT = "br";
private static final String PSEUDO_ELEMENT_ATTR = "vpe:pseudo-element";
private static final String INIT_ELEMENT_ATTR = "vpe:init-element";
@@ -361,21 +368,37 @@
return null;
}
- protected Element createTextNode(Node sourceNode, boolean registerFlag ) {
+ /**
+ * Create a visual element for text node
+ * @param sourceNode
+ * @param registerFlag
+ * @return a visual element for text node
+ */
+
+ protected Node createTextNode(Node sourceNode, boolean registerFlag ) {
String sourceText = sourceNode.getNodeValue();
if (sourceText.trim().length() <= 0) {
registerNodes(new VpeNodeMapping(sourceNode, null));
return null;
}
+ /*
+ Matcher matcher_EL = REGEX_EL.matcher(sourceText);
+ if (matcher_EL.find()) {
+ BundleMap bundle = pageContext.getBundle();
+ int offset = pageContext.getVisualBuilder().getCurrentMainIncludeOffset();
+ if (offset == -1) offset = ((IndexedRegion)sourceNode).getStartOffset();
+ String jsfValue = bundle.getBundleValue(sourceText, offset);
+ sourceText = jsfValue;
+ }
+*/
String visualText = TextUtil.visualText(sourceText);
+
Node visualNewTextNode = visualDocument.createTextNode(visualText);
if (registerFlag) {
registerNodes(new VpeNodeMapping(sourceNode, visualNewTextNode));
}
-
- Element visualNewTextElement = (Element) visualNewTextNode;
-
- return visualNewTextElement;
+
+ return visualNewTextNode;
}
protected Element createComment(Node sourceNode) {
16 years, 8 months
JBoss Tools SVN: r3424 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-03 09:00:22 -0400 (Mon, 03 Sep 2007)
New Revision: 3424
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java
Log:
JBIDE-684
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2007-09-03 12:48:15 UTC (rev 3423)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2007-09-03 13:00:22 UTC (rev 3424)
@@ -214,6 +214,8 @@
|| "JSFMapEntry".equals(entity.getName())) {
children.add("value");
children.add("null-value");
+ } else if("JSFNavigationCase".equals(entity.getName())) {
+ children.add("redirect");
}
return children;
}
16 years, 8 months
JBoss Tools SVN: r3423 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-09-03 08:48:15 -0400 (Mon, 03 Sep 2007)
New Revision: 3423
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java
Log:
http://jira.jboss.com/jira/browse/EXIN-337
Updated methods setPackageStructureFlat and setScopePresentedAsLabel
now this methods are static
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java 2007-09-03 12:18:54 UTC (rev 3422)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/actions/ScopePresentationActionProvider.java 2007-09-03 12:48:15 UTC (rev 3423)
@@ -90,12 +90,12 @@
fEnabled = true;
}
- public void setPackageStructureFlat(boolean s) {
+ public static void setPackageStructureFlat(boolean s) {
IEclipsePreferences p = SeamPreferences.getInstancePreferences();
p.put(PACKAGE_STRUCTURE, s ? "flat" : "hierarchical");
}
- public void setScopePresentedAsLabel(boolean s) {
+ public static void setScopePresentedAsLabel(boolean s) {
IEclipsePreferences p = SeamPreferences.getInstancePreferences();
p.put(SCOPE_PRESENTATION, s ? "label" : "node");
}
16 years, 8 months
JBoss Tools SVN: r3422 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-03 08:18:54 -0400 (Mon, 03 Sep 2007)
New Revision: 3422
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java
Log:
JBIDE-804
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java 2007-09-03 11:27:11 UTC (rev 3421)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java 2007-09-03 12:18:54 UTC (rev 3422)
@@ -166,7 +166,19 @@
value = convertValue(value);
}
String resolved = resolveValue(value, dirtyvalue);
- if(dirtyname != null && name.equals(dirtyname.trim())) name = dirtyname;
+ //preserve one white space after separator
+ if(dirtyvalue != null && dirtyvalue.startsWith(" ")
+ && resolved != null && resolved.length() > 0 && !resolved.startsWith(" ")
+ && !name_value_separator.endsWith(" ")) {
+ resolved = " " + resolved;
+ }
+ if(dirtyname != null && name.equals(dirtyname.trim())) name = dirtyname;
+ //preserve one white space before separator
+ if(dirtyname != null && dirtyname.endsWith(" ")
+ && name != null && name.length() > 0 && !name.endsWith(" ")
+ && !name_value_separator.startsWith(" ")) {
+ name = name + " ";
+ }
sb.append(name);
if(!" ".equals(name_value_separator) || resolved.length() > 0) {
sb.append(name_value_separator);
@@ -293,14 +305,19 @@
String tr = s.trim();
if(tr.length() == 0 || tr.charAt(0) == '#' || tr.charAt(0) == '!') return -1;
boolean n = false;
+ int firstWhiteSpace = -1;
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
if(Character.isWhitespace(c)) {
- if(n) return i;
+ if(n) {
+ if(firstWhiteSpace < 0) firstWhiteSpace = i;
+ //return i;
+ }
continue;
} else if(c == '=' || c == ':') {
return i;
} else {
+ if(n && firstWhiteSpace >= 0) return firstWhiteSpace;
n = true;
}
}
16 years, 8 months
JBoss Tools SVN: r3421 - 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-03 07:27:11 -0400 (Mon, 03 Sep 2007)
New Revision: 3421
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
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-03 11:26:59 UTC (rev 3420)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2007-09-03 11:27:11 UTC (rev 3421)
@@ -104,24 +104,23 @@
public XulRunnerEditor(Composite parent) throws XulRunnerException {
super(parent);
- Listener l = new Listener() {
+ Listener eventListenet = new Listener() {
public void handleEvent(Event event) {
- System.out.println("Activate");
Display.getCurrent().asyncExec(new Thread(){
public void run(){
showSelectionRectangle();
}
});
}};
- addListener(SWT.Activate, l);
- addListener(SWT.Paint, l);
- addListener(SWT.Resize, l);
- addListener(SWT.Show, l);
- addListener(SWT.FocusIn, l);
- addListener(SWT.FocusOut, l);
- addListener(SWT.Selection, l);
- addListener(SWT.Paint, l);
+ addListener(SWT.Activate, eventListenet);
+ addListener(SWT.Paint, eventListenet);
+ addListener(SWT.Resize, eventListenet);
+ addListener(SWT.Show, eventListenet);
+ addListener(SWT.FocusIn, eventListenet);
+ addListener(SWT.FocusOut, eventListenet);
+ addListener(SWT.Selection, eventListenet);
+ addListener(SWT.Paint, eventListenet);
resizeListener = new IVpeResizeListener() {
public void onEndResizing(int usedResizeMarkerHandle, int top,
16 years, 8 months
JBoss Tools SVN: r3420 - 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-03 07:26:59 -0400 (Mon, 03 Sep 2007)
New Revision: 3420
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/VpeSelectionBuilder.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
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-03 11:24:06 UTC (rev 3419)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-09-03 11:26:59 UTC (rev 3420)
@@ -1312,7 +1312,7 @@
private boolean startActiveEditor(int newType) {
//TODO Max Areshkau( add in test purposes, remove after all)
- System.out.print("start");
+// System.out.print("start");
if (type == ACTIVE_EDITOR_NONE) {
if( newType == ACTIVE_EDITOR_SOURCE &&
editPart.getVisualMode() == VpeEditorPart.SOURCE_MODE) {
@@ -1327,7 +1327,7 @@
private void stopActiveEditor() {
//TODO Max Areshkau( add in test purposes, remove after all)
- System.out.println("stop");
+// System.out.println("stop");
onRefresh();
type = ACTIVE_EDITOR_NONE;
}
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2007-09-03 11:24:06 UTC (rev 3419)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2007-09-03 11:26:59 UTC (rev 3420)
@@ -105,12 +105,12 @@
sourceBuilder.setSelection(sourceNode, pos, 0);
break;
case nsIDOMNode.ELEMENT_NODE:
- if (VpeVisualDomBuilder.isIncludeElement((nsIDOMElement)visualSelectedNode)) {
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode, false);
+ if (VpeVisualDomBuilder.isIncludeElement((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID))) {
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false);
visualSelectionController.setCaretEnabled(false);
sourceBuilder.setSelection(sourceNode, 0, 0);
} else if (sourceNode.getNodeType() == Node.COMMENT_NODE) {
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode, false);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false);
// pos = DataHelper.textPos(visualNode.getNodeValue(), selection.getFocusOffset());
pos = selection.getFocusOffset();
try{
@@ -122,7 +122,7 @@
}
sourceBuilder.setSelection(sourceNode, pos, 0);
} else if (visualBuilder.isContentArea(visualSelectedNode) && visualBuilder.isEmptyDocument()) {
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode, false);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false);
sourceBuilder.setSelectionAtDocumentEnd();
} else {
nsIDOMNode containerForPseudoContent = VpePseudoContentCreator.getContainerForPseudoContent(visualNode);
@@ -142,14 +142,14 @@
}
if (!border && visualNode.getNodeType() == Node.TEXT_NODE && node == null) {
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode, false);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false);
sourceBuilder.setAttributeSelection(visualNode, selection.getFocusOffset(), 0);
if (!visualBuilder.isTextEditable(visualNode)) {
visualSelectionController.setCaretEnabled(false);
}
} else {
if (info.startFlag) {
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode, false);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false);
} else {
visualParentElement = (nsIDOMElement)visualSelectedNode.getParentNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
visualBuilder.setSelectionRectangle(visualParentElement, false);
@@ -192,7 +192,7 @@
if (sourceAncestor != null) {
switch (visualSelectedAncestor.getNodeType()) {
case Node.TEXT_NODE:
- nsIDOMElement visualParentElement = (nsIDOMElement)visualSelectedAncestor.getParentNode();
+ nsIDOMElement visualParentElement = (nsIDOMElement)visualSelectedAncestor.getParentNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
visualBuilder.setSelectionRectangle(visualParentElement, false);
// int start = DataHelper.textPos(visualSelectedAncestor.getNodeValue(), selection.getAnchorOffset());
@@ -212,7 +212,7 @@
break;
case Node.ELEMENT_NODE:
if (sourceAncestor.getNodeType() == Node.COMMENT_NODE) {
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedAncestor, false);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedAncestor.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false);
// start = DataHelper.textPos(sourceAncestor.getNodeValue(), selection.getAnchorOffset());
// end = DataHelper.textPos(sourceAncestor.getNodeValue(), selection.getFocusOffset());
start = selection.getAnchorOffset();
@@ -243,7 +243,7 @@
sourceBuilder.setSelection(sourceNode, 0, sourceEndOffset - sourceStartOffset);
}
} else {
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedAncestor, false);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedAncestor.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false);
if (!border && visualAncestor.getNodeType() == Node.TEXT_NODE) {
sourceBuilder.setAttributeSelection(visualAncestor, visualAnchorOffset, visualFocusOffset - visualAnchorOffset);
@@ -406,7 +406,7 @@
offset = text.length();
}
selection.collapse(visualText, offset);
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
}
} else {
if (offset == 0) {
@@ -414,7 +414,7 @@
nsIDOMNode visualParentNode = visualNode.getParentNode();
if (visualParentNode != null && visualParentNode.getNodeType() == Node.ELEMENT_NODE) {
selection.collapse(visualParentNode, offset);
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
} else {
selection.removeAllRanges();
visualBuilder.setSelectionRectangle(null);
@@ -425,23 +425,23 @@
if (appreciableVisualChild.getNodeType() == nsIDOMNode.TEXT_NODE) {
offset = appreciableVisualChild.getNodeValue().length();
selection.collapse(appreciableVisualChild, offset);
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
} else {
offset = (int)VisualDomUtil.getOffset(appreciableVisualChild) + 1;
selection.collapse((nsIDOMNode)visualNode, offset);
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
}
} else {
offset = 0;
selection.collapse(visualNode, offset);
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
}
} else {
offset = (int)VisualDomUtil.getOffset(visualNode);
nsIDOMNode visualParentNode = visualNode.getParentNode();
if (visualParentNode.getNodeType() == nsIDOMNode.ELEMENT_NODE) {
selection.collapse(visualParentNode, offset);
- visualBuilder.setSelectionRectangle((nsIDOMElement)visualParentNode);
+ visualBuilder.setSelectionRectangle((nsIDOMElement)visualParentNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
} else {
selection.removeAllRanges();
visualBuilder.setSelectionRectangle(null);
@@ -1181,14 +1181,28 @@
selection.removeAllRanges();
selection.collapse(visualParent, offset);
selection.extend(visualParent, offset + 1);
+
setSelection(selection);
}
VpeVisualInnerDragInfo getInnerDragInfo(nsIDOMMouseEvent event) {
VpeVisualInnerDragInfo info = null;
+
nsISelection selection = visualSelectionController.getSelection(nsISelectionController.SELECTION_NORMAL);
nsIDOMNode focusNode = selection.getFocusNode();
nsIDOMNode anchorNode = selection.getAnchorNode();
+ //when we select input this function return null
+ //but we select elemnt
+ if(focusNode==null && anchorNode==null) {
+
+ nsIDOMNode visualNode =(nsIDOMNode) event.getTarget().queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+ int offset = (int) VisualDomUtil.getOffset(visualNode);
+ selection.removeAllRanges();
+ selection.collapse(visualNode.getParentNode(), offset);
+ selection.extend(visualNode.getParentNode(), offset + 1);
+ focusNode = selection.getFocusNode();
+ anchorNode = selection.getAnchorNode();
+ }
if (focusNode != null && focusNode.equals(anchorNode)) {
int focusOffset = selection.getFocusOffset();
int anchorOffset = selection.getAnchorOffset();
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-03 11:24:06 UTC (rev 3419)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2007-09-03 11:26:59 UTC (rev 3420)
@@ -372,7 +372,7 @@
getEditorDomEventListener().onShowContextMenu(0, domEvent, (nsIDOMNode) domEvent.getTarget().queryInterface(nsIDOMNode.NS_IDOMNODE_IID));
} else if(DRAGGESTUREEVENT.equals(domEvent.getType())) {
nsIDOMMouseEvent mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID);
-
+
if (editorDomEventListener != null && !isXulElement(mouseEvent)) {
boolean canDragFlag = editorDomEventListener.canInnerDrag(mouseEvent);
//start drag sessionvpe-element
@@ -395,7 +395,6 @@
}
getEditorDomEventListener().onRefresh();
-
//not using default mozilla event handlers
}catch(Throwable th) {
//TODO Max Areshkau remove when all will be adjusted
16 years, 8 months
JBoss Tools SVN: r3419 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-03 07:24:06 -0400 (Mon, 03 Sep 2007)
New Revision: 3419
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
Log:
JBIDE-841
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2007-09-03 11:23:34 UTC (rev 3418)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2007-09-03 11:24:06 UTC (rev 3419)
@@ -79,7 +79,7 @@
if(s == null || !s.startsWith(XModelConstants.WORKSPACE_OLD_REF)) continue;
s = XModelConstants.WORKSPACE_REF + s.substring(XModelConstants.WORKSPACE_OLD_REF.length());
os[i].setAttributeValue("location", s);
- System.out.println("Corrected " + s);
+// System.out.println("Migrated " + s);
}
removeMissingJarSystems(object);
16 years, 8 months
JBoss Tools SVN: r3418 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-03 07:23:34 -0400 (Mon, 03 Sep 2007)
New Revision: 3418
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java
Log:
JBIDE-841
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2007-09-03 11:04:36 UTC (rev 3417)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2007-09-03 11:23:34 UTC (rev 3418)
@@ -393,12 +393,15 @@
if(entry != null) jos.closeEntry();
}
- public static void copy(InputStream f, OutputStream t) throws Exception {
- byte[] b = new byte[1024];
- int q = 0;
- while((q = f.read(b, 0, b.length)) > 0) t.write(b, 0, q);
- f.close();
- t.close();
+ public static void copy(InputStream f, OutputStream t) throws IOException {
+ try {
+ byte[] b = new byte[1024];
+ int q = 0;
+ while((q = f.read(b, 0, b.length)) > 0) t.write(b, 0, q);
+ } finally {
+ f.close();
+ t.close();
+ }
}
public static void unzip(File dest, String jar) throws Exception {
@@ -517,7 +520,10 @@
try {
try {
if(f.isFile() && !isSameFile(f)) f.delete();
- if(!f.exists()) f.createNewFile();
+ if(!f.exists()) {
+ f.getParentFile().mkdirs();
+ f.createNewFile();
+ }
} catch (IOException e) {
CommonPlugin.getPluginLog().logError(e);
}
16 years, 8 months
JBoss Tools SVN: r3417 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-09-03 07:04:36 -0400 (Mon, 03 Sep 2007)
New Revision: 3417
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-872
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-09-03 08:06:28 UTC (rev 3416)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-09-03 11:04:36 UTC (rev 3417)
@@ -267,7 +267,8 @@
}
public boolean isWar() {
- if(getSelectedProject()==null) return true;
+ if(getSelectedProject()==null ||
+ SeamCorePlugin.getSeamFacetPreferences(getSelectedProject().getProject())==null) return true;
return "war".equals(SeamCorePlugin.getSeamFacetPreferences(getSelectedProject().getProject()).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,"war"));
}
}
16 years, 8 months