JBoss Tools SVN: r10207 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-09-11 15:45:22 -0400 (Thu, 11 Sep 2008)
New Revision: 10207
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java
Log:
JBIDE-2741 - exception removed, editor can load, but UI / result is still not ideal. However comments on the UI and how it should work should go in the issue regarding that portion of the UI
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2008-09-11 15:46:52 UTC (rev 10206)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2008-09-11 19:45:22 UTC (rev 10207)
@@ -101,19 +101,24 @@
}
protected void loadResults() {
- String[] files = getFilter().getIncludedFiles();
- String fileLoc;
- ArrayList<XPathFileResult> resultList = new ArrayList<XPathFileResult>();
- List<Node> nodeList = null;
- for( int i = 0; i < files.length; i++ ) {
- fileLoc = new Path(baseDir).append(files[i]).toOSString();
- Document d = getRepository().getDocument(fileLoc);
- if( d != null )
- nodeList = d.selectNodes(xpathPattern);
- if( nodeList != null && nodeList.size() > 0 )
- resultList.add(new XPathFileResult(this, fileLoc, nodeList));
+ try {
+ String[] files = getFilter().getIncludedFiles();
+ String fileLoc;
+ ArrayList<XPathFileResult> resultList = new ArrayList<XPathFileResult>();
+ List<Node> nodeList = null;
+ for( int i = 0; i < files.length; i++ ) {
+ fileLoc = new Path(baseDir).append(files[i]).toOSString();
+ Document d = getRepository().getDocument(fileLoc);
+ if( d != null )
+ nodeList = d.selectNodes(xpathPattern);
+ if( nodeList != null && nodeList.size() > 0 )
+ resultList.add(new XPathFileResult(this, fileLoc, nodeList));
+ }
+ results = resultList.toArray(new XPathFileResult[resultList.size()]);
+ } catch( IllegalStateException ise ) {
+ // cannot load TODO log?
+ results = new XPathFileResult[0];
}
- results = resultList.toArray(new XPathFileResult[resultList.size()]);
}
public String getFirstResult() {
16 years, 2 months
JBoss Tools SVN: r10206 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-09-11 11:46:52 -0400 (Thu, 11 Sep 2008)
New Revision: 10206
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
JBIDE-2613
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-09-11 14:50:02 UTC (rev 10205)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-09-11 15:46:52 UTC (rev 10206)
@@ -247,7 +247,9 @@
private IKeyEventHandler keyEventHandler;
public final static String MODEL_FLAVOR = ModelTransfer.MODEL;
-
+ //contains vpe update delau time in miliseconds
+ private int vpeUpdateDelayTime;
+
public VpeController(VpeEditorPart editPart) {
this.editPart = editPart;
@@ -350,7 +352,9 @@
elReferenceListListener = ELReferenceList.getInstance();
elReferenceListListener.addChangeListener(this);
-
+
+ //initialization of vpe update delay time
+ vpeUpdateDelayTime = 400;
// pageContext.fireTaglibsChanged();
}
@@ -542,10 +546,11 @@
uiJob.setPriority(Job.LONG);
// Fix of JBIDE-1900
- uiJob.schedule(400L);
+ uiJob.schedule(getVpeUpdateDelayTime());
} else {
uiJob.cancel();
- uiJob.schedule(400L);
+ uiJob.schedule(getVpeUpdateDelayTime());
+ setVpeUpdateDelayTime(400);
}
return;
@@ -1219,7 +1224,7 @@
} finally {
switcher.stopActiveEditor();
}
-
+ setVpeUpdateDelayTime(0);
/*
* adding calls of core event handlers, for example' CTR+H' or
* 'CTRL+M' event handler dialog
@@ -3321,5 +3326,19 @@
public VpeVisualDomBuilder getVisualBuilder() {
return visualBuilder;
}
+
+ /**
+ * @return the vpeUpdateDelayTime
+ */
+ private int getVpeUpdateDelayTime() {
+ return vpeUpdateDelayTime;
+ }
+
+ /**
+ * @param vpeUpdateDelayTime the vpeUpdateDelayTime to set
+ */
+ private void setVpeUpdateDelayTime(int vpeUpdateDelayTime) {
+ this.vpeUpdateDelayTime = vpeUpdateDelayTime;
+ }
}
16 years, 2 months
JBoss Tools SVN: r10205 - in trunk/documentation/jbosstools-jdocbook-style/src/main/org/css: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-09-11 10:50:02 -0400 (Thu, 11 Sep 2008)
New Revision: 10205
Added:
trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/images/bkg_gradient.gif
Modified:
trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css
Log:
https://jira.jboss.org/jira/browse/JBDS-336
background image is added to header styles
Modified: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css
===================================================================
--- trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css 2008-09-11 13:51:41 UTC (rev 10204)
+++ trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css 2008-09-11 14:50:02 UTC (rev 10205)
@@ -45,7 +45,7 @@
}
div#overlay{
-background-image:url(../images/community/bkg_gradient.gif);
+background-image:url(../images/bkg_gradient.gif);
background-repeat:repeat-x;
width:100%;
height:100%;
Added: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/images/bkg_gradient.gif
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/images/bkg_gradient.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 2 months
JBoss Tools SVN: r10204 - trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/messages.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-09-11 09:51:41 -0400 (Thu, 11 Sep 2008)
New Revision: 10204
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/messages/messages.properties
Log:
Fix bug jbide-2730
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/messages/messages.properties 2008-09-11 13:18:48 UTC (rev 10203)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/messages/messages.properties 2008-09-11 13:51:41 UTC (rev 10204)
@@ -1,4 +1,3 @@
INCLUDED_CSS_FILES=Included css files
INCLUDED_TAG_LIBS=Included tag libs
-SUBSTITUTED_EL_EXPRESSIONS=Substituted El expressions
ACTUAL_RUN_TIME_ABSOLUTE_FOLDER=Actual Run-Time Absolute Folder
\ No newline at end of file
16 years, 2 months
JBoss Tools SVN: r10203 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-09-11 09:18:48 -0400 (Thu, 11 Sep 2008)
New Revision: 10203
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java
Log:
JBIDE-2025
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java 2008-09-11 12:13:03 UTC (rev 10202)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java 2008-09-11 13:18:48 UTC (rev 10203)
@@ -15,19 +15,9 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.internal.ui.IJavaStatusConstants;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.templates.TemplateContextType;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
import org.jboss.tools.common.model.plugin.IModelPlugin;
-import org.jboss.tools.common.model.ui.templates.ExtendedTemplateContextType;
import org.osgi.framework.BundleContext;
public class ModelUIPlugin extends BaseUIPlugin implements IModelPlugin {
@@ -64,19 +54,8 @@
public void start(BundleContext context) throws Exception {
super.start(context);
- //configureJavaPlugin();
}
- /*private void configureJavaPlugin() {
- TemplateContextType contextType = new ExtendedTemplateContextType();
- JavaPlugin.getDefault().getTemplateContextRegistry().addContextType(contextType);
- }*/
-
- protected void initializeDefaultPluginPreferences() {
- Platform.getBundle(JavaUI.ID_PLUGIN);
- PreferenceConstants.initializeDefaultValues(getPreferenceStore());
- }
-
public static ModelUIPlugin getDefault() {
return INSTANCE;
}
@@ -87,15 +66,10 @@
public static final String PROJECT_OVERRIDE = "org.jboss.tools.common.model.ui.templates.projectOverriveTemplates";
- public static final String PROJECT_CAN_OVERRIDE = "org.jboss.tools.common.model.ui.templates.projectCanOverriveTemplates";
+// public static final String PROJECT_CAN_OVERRIDE = "org.jboss.tools.common.model.ui.templates.projectCanOverriveTemplates";
public static final String ID_PLUGIN= "org.jboss.tools.common.model.ui.templates";
public static final String META_TEMPLATES_DTD = "-//Red Hat Inc.//DTD Meta Templates 1.0//EN";
- protected void initializeDefaultPreferences(IPreferenceStore store) {
- store.setDefault(PROJECT_CAN_OVERRIDE, false);
- super.initializeDefaultPreferences(store);
- }
-
public static String getPluginId() {
return ModelUIPlugin.ID_PLUGIN;
}
16 years, 2 months
JBoss Tools SVN: r10202 - trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-09-11 08:13:03 -0400 (Thu, 11 Sep 2008)
New Revision: 10202
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2756 Unhandled event loop exception when make openOn on <link href="stylesheet/theme.css" ...
Issue is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2008-09-11 11:54:02 UTC (rev 10201)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2008-09-11 12:13:03 UTC (rev 10202)
@@ -191,13 +191,15 @@
}
// Look in runtime environment
- webRootPath = projectPath.append(runtimePath);
- relativePath = Utils.getRelativePath(webRootPath, basePath);
- filePath = relativePath.append(path);
- member = project.getFolder(runtimePath).findMember(filePath);
- if (member != null && (member instanceof IFile)) {
- if (((IFile) member).exists())
- return (IFile) member;
+ if (runtimePath.segmentCount() >= ICoreConstants.MINIMUM_FOLDER_SEGMENT_LENGTH - 1) {
+ webRootPath = projectPath.append(runtimePath);
+ relativePath = Utils.getRelativePath(webRootPath, basePath);
+ filePath = relativePath.append(path);
+ member = project.getFolder(runtimePath).findMember(filePath);
+ if (member != null && (member instanceof IFile)) {
+ if (((IFile) member).exists())
+ return (IFile) member;
+ }
}
}
return null;
16 years, 2 months
JBoss Tools SVN: r10201 - trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-09-11 07:54:02 -0400 (Thu, 11 Sep 2008)
New Revision: 10201
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2753 Unhandled event loop exception when make OpenOn on <location>/anyPage.seam</location> in web.xml if page doesn't exist.
Issue is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2008-09-11 11:33:48 UTC (rev 10200)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2008-09-11 11:54:02 UTC (rev 10201)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.common.text.ext.hyperlink;
+import org.eclipse.core.internal.resources.ICoreConstants;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
@@ -221,10 +222,12 @@
}
// Look in runtime environment
- member = project.getFolder(runtimePath).findMember(path);
- if (member != null) {
- if (((IFile) member).exists())
- return (IFile) member;
+ if (runtimePath.segmentCount() >= ICoreConstants.MINIMUM_FOLDER_SEGMENT_LENGTH - 1) {
+ member = project.getFolder(runtimePath).findMember(path);
+ if (member != null) {
+ if (((IFile) member).exists())
+ return (IFile) member;
+ }
}
}
return null;
16 years, 2 months
JBoss Tools SVN: r10200 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-09-11 07:33:48 -0400 (Thu, 11 Sep 2008)
New Revision: 10200
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTASync.java
Log:
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTASync.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTASync.java 2008-09-11 11:32:07 UTC (rev 10199)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/util/XModelTreeListenerSWTASync.java 2008-09-11 11:33:48 UTC (rev 10200)
@@ -77,6 +77,9 @@
while (!queue.isEmpty()) {
XModelTreeEvent event = queue.poll();
+ synchronized(XModelTreeListenerSWTASync.this) {
+ nodes.remove(event.getModelObject());
+ }
if (event.kind() == XModelTreeEvent.NODE_CHANGED) {
listener.nodeChanged(event);
} else {
16 years, 2 months
JBoss Tools SVN: r10199 - trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-09-11 07:32:07 -0400 (Thu, 11 Sep 2008)
New Revision: 10199
Added:
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/messages.properties
Log:
Fix bug jbide-2730
Added: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/messages.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/messages.properties (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/messages.properties 2008-09-11 11:32:07 UTC (rev 10199)
@@ -0,0 +1 @@
+SUBSTITUTED_EL_EXPRESSIONS=Substituted El expressions
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
16 years, 2 months
JBoss Tools SVN: r10198 - in trunk/esb/plugins/org.jboss.tools.esb.core: resources/meta and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-09-11 07:10:58 -0400 (Thu, 11 Sep 2008)
New Revision: 10198
Added:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBFileImpl.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
Log:
JBIDE-2360
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2008-09-11 09:49:31 UTC (rev 10197)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/plugin.xml 2008-09-11 11:10:58 UTC (rev 10198)
@@ -19,6 +19,8 @@
</extension>
<extension point="org.jboss.tools.common.model.classes">
+ <xclass id="org.jboss.tools.esb.core.model.ESBFileImpl"
+ class="org.jboss.tools.esb.core.model.ESBFileImpl"/>
<xclass id="org.jboss.tools.esb.core.model.ESBFileLoader"
class="org.jboss.tools.esb.core.model.ESBFileLoader"/>
<xclass id="org.jboss.tools.esb.core.model.ESBEntityRecognizer"
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-09-11 09:49:31 UTC (rev 10197)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-09-11 11:10:58 UTC (rev 10198)
@@ -897,8 +897,6 @@
name="id" xmlname="busid"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="port" xmlname="port">
- <Constraint loader="Int"/>
- <Editor name="Int"/>
</XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
@@ -2078,7 +2076,7 @@
</XModelEntity>
<XModelEntity
ImplementationLoadingClass="org.jboss.tools.esb.core.model.ESBFileLoader"
- ImplementingClass="org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl"
+ ImplementingClass="org.jboss.tools.esb.core.model.ESBFileImpl"
ObjectEditorClass="%XML%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
XMLSUBPATH="jbossesb" name="FileESB101">
Added: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBFileImpl.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBFileImpl.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBFileImpl.java 2008-09-11 11:10:58 UTC (rev 10198)
@@ -0,0 +1,16 @@
+package org.jboss.tools.esb.core.model;
+
+import org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl;
+import org.jboss.tools.common.model.impl.OrderedByEntityChildren;
+import org.jboss.tools.common.model.impl.RegularChildren;
+
+public class ESBFileImpl extends SimpleFileImpl {
+ private static final long serialVersionUID = 0L;
+
+ public ESBFileImpl() {}
+
+ protected RegularChildren createChildren() {
+ return new OrderedByEntityChildren();
+ }
+
+}
16 years, 2 months