JBoss Tools SVN: r6482 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2008-02-20 12:09:47 -0500 (Wed, 20 Feb 2008)
New Revision: 6482
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbJsfValuesResource.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1800 Fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbJsfValuesResource.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbJsfValuesResource.java 2008-02-20 16:58:16 UTC (rev 6481)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbJsfValuesResource.java 2008-02-20 17:09:47 UTC (rev 6482)
@@ -32,14 +32,8 @@
}
protected void fillSortedProposalStrings(Set sorted, String beanName, boolean hasProperty) {
- if((query.indexOf("#{")>-1 || query.indexOf("${")>-1)
- && (!query.trim().endsWith("."))
- && (!query.endsWith(")"))
- && (!query.endsWith("]"))
- && (beanName == null || beanName.length() == 0 || !hasProperty)) {
- for (int i = 0; i < fixedJsfValues.length; i++) {
- sorted.add(fixedJsfValues[i]);
- }
+ for (int i = 0; i < fixedJsfValues.length; i++) {
+ sorted.add(fixedJsfValues[i]);
}
}
18 years, 1 month
JBoss Tools SVN: r6481 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2008-02-20 11:58:16 -0500 (Wed, 20 Feb 2008)
New Revision: 6481
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1798 Fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-02-20 16:35:45 UTC (rev 6480)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-02-20 16:58:16 UTC (rev 6481)
@@ -61,6 +61,7 @@
import org.jboss.tools.jst.jsp.editor.TLDRegisterHelper;
import org.jboss.tools.jst.jsp.outline.ValueHelper;
import org.jboss.tools.jst.jsp.support.kb.FaceletsJsfCResource;
+import org.jboss.tools.jst.jsp.support.kb.WTPKbJsfValuesResource;
import org.jboss.tools.jst.jsp.support.kb.WTPKbdBeanMethodResource;
import org.jboss.tools.jst.jsp.support.kb.WTPKbdBeanPropertyResource;
import org.jboss.tools.jst.jsp.support.kb.WTPKbdBundlePropertyResource;
@@ -191,7 +192,9 @@
proposals.addAll(r2.queryProposal(matchString));
WTPKbdBundlePropertyResource r3 = new WTPKbdBundlePropertyResource(input, h.getConnector());
proposals.addAll(r3.queryProposal(matchString));
-
+ WTPKbJsfValuesResource r4 = new WTPKbJsfValuesResource(input, h.getConnector());
+ proposals.addAll(r4.queryProposal(matchString));
+
for (Iterator iter = proposals.iterator(); iter.hasNext();) {
KbProposal kbProposal = cleanFaceletProposal((KbProposal)iter.next());
kbProposal.postProcess(currentValue, offset);
18 years, 1 month
JBoss Tools SVN: r6480 - in trunk: vpe/plugins and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: svasilyev
Date: 2008-02-20 11:35:45 -0500 (Wed, 20 Feb 2008)
New Revision: 6480
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.jsp/
Removed:
trunk/jst/plugins/org.jboss.tools.jst.vpe.jsp/
Log:
Replace to avoid circle dependencies.
Copied: trunk/vpe/plugins/org.jboss.tools.vpe.jsp (from rev 6479, trunk/jst/plugins/org.jboss.tools.jst.vpe.jsp)
18 years, 1 month
JBoss Tools SVN: r6479 - in trunk: vpe/plugins and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: svasilyev
Date: 2008-02-20 11:31:28 -0500 (Wed, 20 Feb 2008)
New Revision: 6479
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.html/
Removed:
trunk/jst/plugins/org.jboss.tools.jst.vpe.html/
Log:
Replace to avoid circle dependencies.
Copied: trunk/vpe/plugins/org.jboss.tools.vpe.html (from rev 6478, trunk/jst/plugins/org.jboss.tools.jst.vpe.html)
18 years, 1 month
JBoss Tools SVN: r6478 - trunk/tests/features/org.jboss.tools.test.feature.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2008-02-20 11:25:27 -0500 (Wed, 20 Feb 2008)
New Revision: 6478
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
Log:
JBIDE-1687
including plug-ins with templates for struts tags in build
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-02-20 16:13:32 UTC (rev 6477)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-02-20 16:25:27 UTC (rev 6478)
@@ -363,4 +363,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.struts.vpe.struts"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
18 years, 1 month
JBoss Tools SVN: r6477 - branches/jbosstools-2.0.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2008-02-20 11:13:32 -0500 (Wed, 20 Feb 2008)
New Revision: 6477
Modified:
branches/jbosstools-2.0.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1799 CA: There is no CA for <h:outputText value="|"/> on XHTML pages.
Fixed
Modified: branches/jbosstools-2.0.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java
===================================================================
--- branches/jbosstools-2.0.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java 2008-02-20 16:01:07 UTC (rev 6476)
+++ branches/jbosstools-2.0.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java 2008-02-20 16:13:32 UTC (rev 6477)
@@ -336,8 +336,10 @@
String matchString = contentAssistRequest.getMatchString();
if (matchString.length() > StringUtils.strip(text).length() &&
- ( (matchString.startsWith("\"") && matchString.endsWith("\""))
- || (matchString.startsWith("'") && matchString.endsWith("\"")))) {
+ ( (matchString.startsWith("\"") && matchString.endsWith("\"") &&
+ (matchString.indexOf("\"") != matchString.lastIndexOf("\"")))
+ || (matchString.startsWith("'") && matchString.endsWith("\"") &&
+ (matchString.indexOf("\"") != matchString.lastIndexOf("\""))))) {
return;
}
18 years, 1 month
JBoss Tools SVN: r6476 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: wizard and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2008-02-20 11:01:07 -0500 (Wed, 20 Feb 2008)
New Revision: 6476
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-518
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java 2008-02-20 15:49:30 UTC (rev 6475)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamGuiPlugin.java 2008-02-20 16:01:07 UTC (rev 6476)
@@ -13,6 +13,10 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
+import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.event.ISeamProjectChangeListener;
+import org.jboss.tools.seam.core.event.SeamProjectChangeEvent;
+import org.jboss.tools.seam.ui.wizard.OpenSeamComponentDialog;
import org.osgi.framework.BundleContext;
/**
@@ -69,4 +73,13 @@
public static IPluginLog getPluginLog() {
return getDefault();
}
+
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ SeamCorePlugin.addSeamProjectListener(new ISeamProjectChangeListener(){
+ public void projectChanged(SeamProjectChangeEvent event) {
+ OpenSeamComponentDialog.validateHistory(event.getProject());
+ }
+ });
+ }
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java 2008-02-20 15:49:30 UTC (rev 6475)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java 2008-02-20 16:01:07 UTC (rev 6476)
@@ -364,7 +364,9 @@
}
- public static void validateHistory(){
+ public static void validateHistory(ISeamProject seamProject){
+ String seamProjectName = seamProject.getProject().getName();
+
XMLMemento memento = loadMemento();
if(memento != null){
XMLMemento historyMemento = (XMLMemento) memento
@@ -383,26 +385,29 @@
mem.putString(COMPONENT_DELETED, "yes");
continue;
}
- String componentName = mem.getString(COMPONENT_NAME);
- if (componentName == null){
- mem.putString(COMPONENT_DELETED, "yes");
- continue;
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot()
- .getProject(projectName);
- if (project != null) {
- ISeamProject seamProject = SeamCorePlugin.getSeamProject(
- project, true);
- if (seamProject != null) {
- ISeamComponent component = seamProject
- .getComponent(componentName);
- if(component == null)
+ if(projectName.equals(seamProjectName)){
+ String componentName = mem.getString(COMPONENT_NAME);
+ if (componentName == null){
+ mem.putString(COMPONENT_DELETED, "yes");
+ continue;
+ }
+ IProject project = ResourcesPlugin.getWorkspace().getRoot()
+ .getProject(projectName);
+ if (project != null) {
+ ISeamProject cSeamProject = SeamCorePlugin.getSeamProject(
+ project, true);
+ if (cSeamProject != null) {
+ ISeamComponent component = cSeamProject
+ .getComponent(componentName);
+ if(component == null)
+ mem.putString(COMPONENT_DELETED, "yes");
+ else
+ mem.putString(COMPONENT_DELETED, "no");
+ }else
mem.putString(COMPONENT_DELETED, "yes");
}else
mem.putString(COMPONENT_DELETED, "yes");
- }else
- mem.putString(COMPONENT_DELETED, "yes");
-
+ }
}
saveMemento(memento);
}
18 years, 1 month
JBoss Tools SVN: r6475 - in trunk/vpe/plugins: org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: svasilyev
Date: 2008-02-20 10:49:30 -0500 (Wed, 20 Feb 2008)
New Revision: 6475
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/util/DOMTreeDumper.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
Improvement of VPE debug settings
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java 2008-02-20 15:07:37 UTC (rev 6474)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java 2008-02-20 15:49:30 UTC (rev 6475)
@@ -29,6 +29,7 @@
public static final boolean VISUAL_CONTEXTMENU_DUMP_SOURCE;
public static final boolean VISUAL_CONTEXTMENU_DUMP_MAPPING;
+ public static final boolean VISUAL_DUMP_PRINT_HASH;
public static final boolean VISUAL_CONTEXTMENU_TEST;
@@ -37,25 +38,26 @@
public static final boolean USE_PRINT_STACK_TRACE;
static {
- PRINT_SOURCE_MUTATION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/mutation_event")); // $NON-NSL-1$ // $NON-NSL-1$
- PRINT_SOURCE_SELECTION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/selection_event")); // $NON-NSL-1$ // $NON-NSL-1$
- PRINT_SOURCE_MODEL_LIFECYCLE_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/model_lifecycle_event")); // $NON-NSL-1$ // $NON-NSL-1$
+ PRINT_SOURCE_MUTATION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/mutation_event")); //$NON-NLS-1$ //$NON-NLS-2$
+ PRINT_SOURCE_SELECTION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/selection_event")); //$NON-NLS-1$ //$NON-NLS-2$
+ PRINT_SOURCE_MODEL_LIFECYCLE_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/model_lifecycle_event")); //$NON-NLS-1$ //$NON-NLS-2$
- PRINT_VISUAL_MUTATION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/mutation_event")); // $NON-NSL-1$ // $NON-NSL-1$
- PRINT_VISUAL_SELECTION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/selection_event")); // $NON-NSL-1$ // $NON-NSL-1$
- PRINT_VISUAL_CONTEXTMENU_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu_event")); // $NON-NSL-1$ // $NON-NSL-1$
- PRINT_VISUAL_MOUSE_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/mouse_event")); // $NON-NSL-1$ // $NON-NSL-1$
- PRINT_VISUAL_DRAGDROP_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/dragdrop_event")); // $NON-NSL-1$ // $NON-NSL-1$
- PRINT_VISUAL_KEY_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/key_event")); // $NON-NSL-1$ // $NON-NSL-1$
- PRINT_VISUAL_INNER_DRAGDROP_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/inner_dragdrop_event")); // $NON-NSL-1$ // $NON-NSL-1$
+ PRINT_VISUAL_MUTATION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/mutation_event")); //$NON-NLS-1$ //$NON-NLS-2$
+ PRINT_VISUAL_SELECTION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/selection_event")); //$NON-NLS-1$ //$NON-NLS-2$
+ PRINT_VISUAL_CONTEXTMENU_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu_event")); //$NON-NLS-1$ //$NON-NLS-2$
+ PRINT_VISUAL_MOUSE_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/mouse_event")); //$NON-NLS-1$ //$NON-NLS-2$
+ PRINT_VISUAL_DRAGDROP_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/dragdrop_event")); //$NON-NLS-1$ //$NON-NLS-2$
+ PRINT_VISUAL_KEY_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/key_event")); //$NON-NLS-1$ //$NON-NLS-2$
+ PRINT_VISUAL_INNER_DRAGDROP_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/inner_dragdrop_event")); //$NON-NLS-1$ //$NON-NLS-2$
- VISUAL_ADD_PSEUDO_ELEMENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/add_pseudo_element")); // $NON-NSL-1$ // $NON-NSL-1$
+ VISUAL_ADD_PSEUDO_ELEMENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/add_pseudo_element")); //$NON-NLS-1$ //$NON-NLS-2$
- VISUAL_CONTEXTMENU_DUMP_SOURCE = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/dump_source")); // $NON-NSL-1$ // $NON-NSL-1$
- VISUAL_CONTEXTMENU_DUMP_MAPPING = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/dump_mapping")); // $NON-NSL-1$ // $NON-NSL-1$
+ VISUAL_CONTEXTMENU_DUMP_SOURCE = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/dump_source")); //$NON-NLS-1$ //$NON-NLS-2$
+ VISUAL_CONTEXTMENU_DUMP_MAPPING = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/dump_mapping")); //$NON-NLS-1$ //$NON-NLS-2$
+ VISUAL_DUMP_PRINT_HASH = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/dump_print_hash")); //$NON-NLS-1$ //$NON-NLS-2$
- VISUAL_CONTEXTMENU_TEST = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/show_test")); // $NON-NSL-1$ // $NON-NSL-1$
+ VISUAL_CONTEXTMENU_TEST = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/show_test")); //$NON-NLS-1$ //$NON-NLS-2$
- USE_PRINT_STACK_TRACE = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/use_PrintStackTrace")); // $NON-NSL-1$ // $NON-NSL-1$
+ USE_PRINT_STACK_TRACE = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/use_PrintStackTrace")); //$NON-NLS-1$ //$NON-NLS-2$
}
}
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-02-20 15:07:37 UTC (rev 6474)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-02-20 15:49:30 UTC (rev 6475)
@@ -1101,7 +1101,7 @@
if (VpeDebug.VISUAL_CONTEXTMENU_DUMP_SOURCE) {
manager.add(new Action("Dump Source") { //$NON-NLS-1$
public void run() {
- DOMTreeDumper dumper = new DOMTreeDumper();
+ DOMTreeDumper dumper = new DOMTreeDumper(VpeDebug.VISUAL_DUMP_PRINT_HASH);
dumper.dumpToStream(System.out, visualEditor.getDomDocument());
}
});
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/util/DOMTreeDumper.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/util/DOMTreeDumper.java 2008-02-20 15:07:37 UTC (rev 6474)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/util/DOMTreeDumper.java 2008-02-20 15:49:30 UTC (rev 6475)
@@ -18,31 +18,47 @@
import org.mozilla.interfaces.nsIDOMNamedNodeMap;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsIDOMNodeList;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
public class DOMTreeDumper {
private PrintStream ps;
private boolean inA;
- private final String[] endTagForbiddenNames = {"AREA",
- "BASE",
- "BASEFONT",
- "BR",
- "COL",
- "FRAME",
- "HR",
- "IMG",
- "INPUT",
- "ISINDEX",
- "LINK",
- "META",
- "PARAM"};
+ /**
+ * Flag to print hash code of object while dump node
+ * default true
+ */
+ private boolean printHashCode;
+
+ private final String[] endTagForbiddenNames = {"AREA", //$NON-NLS-1$
+ "BASE", //$NON-NLS-1$
+ "BASEFONT", //$NON-NLS-1$
+ "BR", //$NON-NLS-1$
+ "COL", //$NON-NLS-1$
+ "FRAME", //$NON-NLS-1$
+ "HR", //$NON-NLS-1$
+ "IMG", //$NON-NLS-1$
+ "INPUT", //$NON-NLS-1$
+ "ISINDEX", //$NON-NLS-1$
+ "LINK", //$NON-NLS-1$
+ "META", //$NON-NLS-1$
+ "PARAM"}; //$NON-NLS-1$
- public void dumpToStream(PrintStream ps, nsIDOMDocument doc) {
+ public DOMTreeDumper() {
+ this.printHashCode = true;
+ }
+
+ public DOMTreeDumper(boolean isPrintHashCode) {
+ this.printHashCode = isPrintHashCode;
+ }
+
+ public boolean isPrintHashCode() {
+ return printHashCode;
+ }
+
+ public void setPrintHashCode(boolean printHashCode) {
+ this.printHashCode = printHashCode;
+ }
+
+ public void dumpToStream(PrintStream ps, nsIDOMDocument doc) {
this.ps = ps;
dumpDocument(doc);
}
@@ -76,59 +92,62 @@
String value = node.getNodeValue();
switch (type) {
- case Node.ELEMENT_NODE:
- if (name.equals("A")) {
+ case nsIDOMNode.ELEMENT_NODE:
+ if (name.equals("A")) { //$NON-NLS-1$
inA = true;
}
- if (!(inA || name.equals("BR"))) {
+ if (!(inA || name.equals("BR"))) { //$NON-NLS-1$
ps.println();
}
- ps.print("<" + name);
+ ps.print("<" + name); //$NON-NLS-1$
dumpAttributes(node);
- ps.print(">(" + node.hashCode() + ")");
+ ps.print(">"); //$NON-NLS-1$
+
+ printHashCode(node);
+
dumpChildren(node);
- if (name.equals("A")) {
+ if (name.equals("A")) { //$NON-NLS-1$
inA = false;
}
if (!endTagForbidden(name)) {
- ps.print("</" + name + ">");
+ ps.print("</" + name + ">"); //$NON-NLS-1$ //$NON-NLS-2$
}
break;
- case Node.ATTRIBUTE_NODE:
+ case nsIDOMNode.ATTRIBUTE_NODE:
nsIDOMAttr attr = (nsIDOMAttr) node.queryInterface(nsIDOMAttr.NS_IDOMATTR_IID);
if (attr.getSpecified()) {
- ps.print(" " + attr.getName().toUpperCase() + "=\"" + attr.getValue() + "\"");
+ ps.print(" " + attr.getName().toUpperCase() + "=\"" + attr.getValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else {
- ps.print(" " + attr.getName().toUpperCase());
+ ps.print(" " + attr.getName().toUpperCase()); //$NON-NLS-1$
}
break;
- case Node.TEXT_NODE:
- if (!node.getParentNode().getNodeName().equals("PRE")) {
+ case nsIDOMNode.TEXT_NODE:
+ if (!node.getParentNode().getNodeName().equals("PRE")) { //$NON-NLS-1$
value = value.trim();
}
- if (!value.equals("")) {
+ if (!value.equals("")) { //$NON-NLS-1$
if (!inA) {
ps.println();
}
ps.print(canonicalize(value));
}
- ps.print("(" + node.hashCode() + ")");
+ printHashCode(node);
break;
- case Node.COMMENT_NODE:
- ps.print("\n<!--" + value + "-->");
+ case nsIDOMNode.COMMENT_NODE:
+ ps.print("\n<!--" + value + "-->"); //$NON-NLS-1$ //$NON-NLS-2$
break;
- case Node.CDATA_SECTION_NODE:
- case Node.ENTITY_REFERENCE_NODE:
- case Node.ENTITY_NODE:
- case Node.PROCESSING_INSTRUCTION_NODE:
- case Node.DOCUMENT_NODE:
- case Node.DOCUMENT_TYPE_NODE:
- case Node.DOCUMENT_FRAGMENT_NODE:
- case Node.NOTATION_NODE:
- ps.println("\n<!-- NOT HANDLED: " + name +
- " value=" + value + " -->");
+ case nsIDOMNode.CDATA_SECTION_NODE:
+ case nsIDOMNode.ENTITY_REFERENCE_NODE:
+ case nsIDOMNode.ENTITY_NODE:
+ case nsIDOMNode.PROCESSING_INSTRUCTION_NODE:
+ case nsIDOMNode.DOCUMENT_NODE:
+ case nsIDOMNode.DOCUMENT_TYPE_NODE:
+ case nsIDOMNode.DOCUMENT_FRAGMENT_NODE:
+ case nsIDOMNode.NOTATION_NODE:
+ ps.println("\n<!-- NOT HANDLED: " + name + //$NON-NLS-1$
+ " value=" + value + " -->"); //$NON-NLS-1$ //$NON-NLS-2$
break;
}
}
@@ -166,16 +185,16 @@
for (int i = 0; i < length; i++) {
switch (c = in.charAt(i)) {
case '&' :
- out.append("&");
+ out.append("&"); //$NON-NLS-1$
break;
case '<':
- out.append("<");
+ out.append("<"); //$NON-NLS-1$
break;
case '>':
- out.append(">");
+ out.append(">"); //$NON-NLS-1$
break;
case '\u00A0':
- out.append(" ");
+ out.append(" "); //$NON-NLS-1$
break;
default:
out.append(c);
@@ -192,4 +211,10 @@
}
return false;
}
+
+ private void printHashCode(Object o) {
+ if (isPrintHashCode()) {
+ ps.print("(" + o.hashCode() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ }
}
\ No newline at end of file
18 years, 1 month
JBoss Tools SVN: r6474 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2008-02-20 10:07:37 -0500 (Wed, 20 Feb 2008)
New Revision: 6474
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/SeamProjectChangeEvent.java
Log:
JBIDE-1785 Event object fixed.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/SeamProjectChangeEvent.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/SeamProjectChangeEvent.java 2008-02-20 14:59:29 UTC (rev 6473)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/event/SeamProjectChangeEvent.java 2008-02-20 15:07:37 UTC (rev 6474)
@@ -34,6 +34,7 @@
public SeamProjectChangeEvent(ISeamProject project, List<Change> changes) {
super(project);
+ this.project = project;
this.changes = changes;
}
18 years, 1 month
JBoss Tools SVN: r6473 - trunk/struts/plugins/org.jboss.tools.struts/resources/meta.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2008-02-20 09:59:29 -0500 (Wed, 20 Feb 2008)
New Revision: 6473
Modified:
trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta
Log:
http://jira.jboss.com/jira/browse/JBIDE-1737 Fixed
Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta 2008-02-20 14:58:20 UTC (rev 6472)
+++ trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta 2008-02-20 14:59:29 UTC (rev 6473)
@@ -224,7 +224,7 @@
</XModelAttributes>
<XActionItem kind="list">
<XActionItem ICON="action.empty"
- displayName="JBoss Developer Studio Struts" group="1" kind="list" name="StrutsStudio">
+ displayName="JBoss Tools Struts" group="1" kind="list" name="StrutsStudio">
<XActionItem
HandlerClassName="org.jboss.tools.struts.model.pv.handler.StrutsProjectsRootRedirectHandler"
ICON="action.empty" PROPERTIES="actionpath=SynchronizeModules"
18 years, 1 month