JBoss Tools SVN: r13452 - trunk/esb/plugins/org.jboss.tools.esb.project.core.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-02-03 11:55:44 -0500 (Tue, 03 Feb 2009)
New Revision: 13452
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
Log:
JBIDE-3721 Can't change target runtime for Example Project imported into workspace.
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2009-02-03 16:45:53 UTC (rev 13451)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2009-02-03 16:55:44 UTC (rev 13452)
@@ -99,6 +99,16 @@
version="4.2">
</runtime-component>
</supported>
+ <supported>
+ <facet
+ id="jst.jboss.esb"
+ version="4.2,4.3,4.4">
+ </facet>
+ <runtime-component
+ id="org.jboss.ide.eclipse.eap.runtime.component"
+ version="4.3">
+ </runtime-component>
+ </supported>
</extension>
<extension
id="ESBNature"
15 years, 11 months
JBoss Tools SVN: r13451 - trunk/seam/docs/reference/en/images/adding_seam_support_to_project.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-02-03 11:45:53 -0500 (Tue, 03 Feb 2009)
New Revision: 13451
Modified:
trunk/seam/docs/reference/en/images/adding_seam_support_to_project/added_seam_support_to_ear_project.png
trunk/seam/docs/reference/en/images/adding_seam_support_to_project/adding_seam_support_to_ejb_project.png
trunk/seam/docs/reference/en/images/adding_seam_support_to_project/adding_seam_support_to_war_project.png
trunk/seam/docs/reference/en/images/adding_seam_support_to_project/application_xml_with_jboss-seam_jar.png
trunk/seam/docs/reference/en/images/adding_seam_support_to_project/including_libs_from_ear_to_ejb_manifest_class-path.png
trunk/seam/docs/reference/en/images/adding_seam_support_to_project/including_libs_from_ear_to_war_manifest_class-path.png
trunk/seam/docs/reference/en/images/adding_seam_support_to_project/java_ee_module_dependencies.png
trunk/seam/docs/reference/en/images/adding_seam_support_to_project/wtp_projects.png
Log:
https://jira.jboss.org/jira/browse/JBDS-568 - screens are updated;
Modified: trunk/seam/docs/reference/en/images/adding_seam_support_to_project/added_seam_support_to_ear_project.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/adding_seam_support_to_project/adding_seam_support_to_ejb_project.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/adding_seam_support_to_project/adding_seam_support_to_war_project.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/adding_seam_support_to_project/application_xml_with_jboss-seam_jar.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/adding_seam_support_to_project/including_libs_from_ear_to_ejb_manifest_class-path.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/adding_seam_support_to_project/including_libs_from_ear_to_war_manifest_class-path.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/adding_seam_support_to_project/java_ee_module_dependencies.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/adding_seam_support_to_project/wtp_projects.png
===================================================================
(Binary files differ)
15 years, 11 months
JBoss Tools SVN: r13450 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-02-03 11:05:44 -0500 (Tue, 03 Feb 2009)
New Revision: 13450
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSF.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFMediaOutput.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/mediaOutput.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/mediaOutput.xhtml.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
Log:
RESOLVED - issue JBIDE-3717: Some attrs of a4j:mediaOutput don't work.
https://jira.jboss.org/jira/browse/JBIDE-3717
- Support of attributes 'align', 'border', 'dir', 'hspace', 'vspace', 'id', 'style', 'styleClass', 'element', 'uriAttribute' has been added
- JUnit test has been rewritten
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSF.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSF.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSF.java 2009-02-03 16:05:44 UTC (rev 13450)
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 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.jsf.vpe.ajax4jsf.template;
+
+/**
+ * Contains Ajax4JSF tags and attributes names
+ *
+ * @author yradtsevich
+ */
+public final class Ajax4JSF {
+ public static final String ATTR_ELEMENT = "element"; //$NON-NLS-1$
+ public static final String ATTR_URI_ATTRIBUTE = "uriAttribute"; //$NON-NLS-1$
+ public static final String ATTR_STYLE_CLASS = "styleClass"; //$NON-NLS-1$
+}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFMediaOutput.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFMediaOutput.java 2009-02-03 14:09:04 UTC (rev 13449)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFMediaOutput.java 2009-02-03 16:05:44 UTC (rev 13450)
@@ -7,10 +7,12 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.jsf.vpe.ajax4jsf.template;
import java.io.File;
+import java.util.Arrays;
+import java.util.List;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -18,49 +20,63 @@
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+/**
+ * The template for {@code <a4j:mediaOutput>} tag.
+ *
+ * @author dmaliarevich
+ * @author dsakovich
+ * @author yradtsevich
+ */
public class Ajax4JSFMediaOutput extends VpeAbstractTemplate {
+ private static final String IMG_PATH = "mediaOutput/mediaOutput.jpg"; //$NON-NLS-1$
+
+ private static final List<String> SAME_ATTRIBUTES_LIST;
+ static {
+ String []sameAttributes = {HTML.ATTR_ALIGN, HTML.ATTR_BORDER, HTML.ATTR_DIR,
+ HTML.ATTR_HSPACE, HTML.ATTR_ID, HTML.ATTR_STYLE, HTML.ATTR_VSPACE};
+ for (int i = 0; i < sameAttributes.length; i++) {
+ sameAttributes[i] = sameAttributes[i].toLowerCase();
+ }
+ SAME_ATTRIBUTES_LIST = Arrays.asList(sameAttributes);
+ }
- public static final String ALT_MEDIA_OTPUT = " mediaOutput";
-
- public static final String HTML_TAG_DIV = "DIV";
- public static final String HTML_TAG_IMG = "IMG";
-
- public static final String ATTR_WIDTH = "WIDTH";
- public static final String ATTR_HEIGHT = "HEIGHT";
- public static final String ATTR_SRC = "src";
- public static final String ATTR_ALT = "alt";
-
- public static final String IMG_PATH = "mediaOutput/mediaOutput.jpg";
-
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
-
- nsIDOMElement mainDiv = visualDocument
- .createElement(HTML_TAG_DIV);
- nsIDOMElement img = visualDocument
- .createElement(HTML_TAG_IMG);
-
- img.setAttribute(ATTR_SRC, "file:///" + getAbsoluteResourcePath(IMG_PATH).replace('\\', '/'));
- img.setAttribute(ATTR_ALT, ALT_MEDIA_OTPUT);
- img.setAttribute(ATTR_WIDTH, "100");
- img.setAttribute(ATTR_HEIGHT, "50");
-
- mainDiv.appendChild(img);
-
- return new VpeCreationData(mainDiv);
+
+ Element sourceElement = (Element) sourceNode;
+ nsIDOMElement mainTag = createMainTag(visualDocument, sourceElement);
+
+ String uriAttribute = sourceElement.getAttribute(Ajax4JSF.ATTR_URI_ATTRIBUTE);
+ if (uriAttribute == null || "".equals(uriAttribute)) { //$NON-NLS-1$
+ uriAttribute = HTML.ATTR_SRC;
+ }
+
+ mainTag.setAttribute(uriAttribute, "file:///" + getAbsoluteResourcePath(IMG_PATH).replace('\\', '/')); //$NON-NLS-1$
+
+ VisualDomUtil.copyAttributes(sourceElement, SAME_ATTRIBUTES_LIST, mainTag);
+
+ String styleClass = sourceElement.getAttribute(Ajax4JSF.ATTR_STYLE_CLASS);
+ if (styleClass != null) {
+ mainTag.setAttribute(HTML.ATTR_CLASS, styleClass);
+ }
+
+ return new VpeCreationData(mainTag);
}
-
+
+ @Override
public boolean isRecreateAtAttrChange(VpePageContext pageContext,
Element sourceElement, nsIDOMDocument visualDocument,
nsIDOMElement visualNode, Object data, String name, String value) {
return true;
}
-
+
public static String getAbsoluteResourcePath(String resourcePathInPlugin) {
String pluginPath = Activator.getPluginResourcePath();
IPath pluginFile = new Path(pluginPath);
@@ -68,9 +84,23 @@
if (file.exists()) {
return file.getAbsolutePath();
} else {
- throw new RuntimeException("Can't get path for "
- + resourcePathInPlugin);
+ throw new RuntimeException("Can't get path for " + resourcePathInPlugin); //$NON-NLS-1$
}
}
-
+
+ /**
+ * Creates HTML element with tag-name specified in {@code element} attribute of
+ * {@code sourceElement}, or if the attribute is not present {@code 'img'} is used.
+ */
+ private static nsIDOMElement createMainTag(nsIDOMDocument visualDocument,
+ Element sourceElement) {
+ String element = sourceElement.getAttribute(Ajax4JSF.ATTR_ELEMENT);
+
+ if (element == null || "".equals(element)) { //$NON-NLS-1$
+ element = HTML.TAG_IMG;
+ }
+
+ nsIDOMElement mainTag = visualDocument.createElement(element);
+ return mainTag;
+ }
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/mediaOutput.xhtml
===================================================================
(Binary files differ)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/mediaOutput.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/mediaOutput.xhtml.xml 2009-02-03 14:09:04 UTC (rev 13449)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/mediaOutput.xhtml.xml 2009-02-03 16:05:44 UTC (rev 13450)
@@ -1,9 +1,18 @@
<tests>
- <test id="mediaOutput">
- <DIV>
- <IMG WIDTH="100" HEIGHT="50"
+ <test id="mediaOutput1">
+ <IMG SRC="/.*resources/mediaOutput/mediaOutput.jpg/" ID="mediaOutput1"/>
+ </test>
+ <test id="mediaOutput2">
+ <IMG BORDER="20" ALIGN="right"
SRC="/.*resources/mediaOutput/mediaOutput.jpg/"
- ALT=" mediaOutput"/>
- </DIV>
+ ID="mediaOutput2"
+ STYLE="background-color: green;"
+ CLASS="dotted-border"/>
</test>
+ <test id="mediaOutput3">
+ <A HREF="/.*resources/mediaOutput/mediaOutput.jpg/"
+ ID="mediaOutput3"
+ STYLE="background-color: green;"
+ CLASS="dotted-border"/>
+ </test>
</tests>
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2009-02-03 14:09:04 UTC (rev 13449)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2009-02-03 16:05:44 UTC (rev 13450)
@@ -83,6 +83,8 @@
public static final String ATTR_CELLPADDING = "cellpadding"; //$NON-NLS-1$
public static final String ATTR_WIDTH = "width"; //$NON-NLS-1$
public static final String ATTR_HEIGHT = "height"; //$NON-NLS-1$
+ public static final String ATTR_HSPACE = "hspace"; //$NON-NLS-1$
+ public static final String ATTR_VSPACE = "vspace"; //$NON-NLS-1$
public static final String ATTR_BORDER = "border"; //$NON-NLS-1$
public static final String ATTR_FOR = "FOR"; //$NON-NLS-1$
public static final String ATTR_DIR = "dir"; //$NON-NLS-1$
15 years, 11 months
JBoss Tools SVN: r13449 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute: editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-02-03 09:09:04 -0500 (Tue, 03 Feb 2009)
New Revision: 13449
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/AttributeContentProposalProviderFactory.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/DialogCellEditorEx.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringEditor.java
Log:
JBIDE-3647
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/AttributeContentProposalProviderFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/AttributeContentProposalProviderFactory.java 2009-02-03 14:01:19 UTC (rev 13448)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/AttributeContentProposalProviderFactory.java 2009-02-03 14:09:04 UTC (rev 13449)
@@ -26,6 +26,7 @@
import org.eclipse.jface.fieldassist.FieldDecoration;
import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.jface.fieldassist.IContentProposal;
+import org.eclipse.jface.fieldassist.IContentProposalListener2;
import org.eclipse.jface.fieldassist.IContentProposalProvider;
import org.eclipse.jface.fieldassist.IControlContentAdapter;
import org.eclipse.jface.fieldassist.TextContentAdapter;
@@ -62,15 +63,23 @@
}
public static void registerContentAssist(DefaultValueAdapter valueAdapter, Control control) {
+ registerContentAssist(valueAdapter, control, null);
+ }
+
+ public static void registerContentAssist(DefaultValueAdapter valueAdapter, Control control, IContentProposalListener2 listener) {
XModelObject object = valueAdapter.getModelObject();
XAttribute attr = valueAdapter.getAttribute();
if (attr == null && valueAdapter.getAttributeData() != null) {
attr = valueAdapter.getAttributeData().getAttribute();
}
- registerContentAssist(object, attr, control);
+ registerContentAssist(object, attr, control, listener);
}
public static void registerContentAssist(XModelObject object, XAttribute attr, Control control) {
+ registerContentAssist(object, attr, control, null);
+ }
+
+ public static void registerContentAssist(XModelObject object, XAttribute attr, Control control, IContentProposalListener2 listener) {
IControlContentAdapter controlAdapter = control instanceof Text
? new TextContentAdapter()
: control instanceof Combo
@@ -96,6 +105,9 @@
null);
adapter.setPropagateKeys(true);
adapter.setProposalAcceptanceStyle(p.getProposalAcceptanceStyle());
+ if(listener != null) {
+ adapter.addContentProposalListener(listener);
+ }
added = true;
}
if (!ps.isEmpty()) {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/DialogCellEditorEx.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/DialogCellEditorEx.java 2009-02-03 14:01:19 UTC (rev 13448)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/DialogCellEditorEx.java 2009-02-03 14:09:04 UTC (rev 13449)
@@ -12,8 +12,11 @@
import org.jboss.tools.common.model.ui.IValueChangeListener;
import org.jboss.tools.common.model.ui.IValueProvider;
+import org.jboss.tools.common.model.ui.attribute.AttributeContentProposalProviderFactory;
import org.jboss.tools.common.model.ui.attribute.adapter.DefaultValueAdapter;
import org.eclipse.jdt.internal.ui.refactoring.contentassist.ControlContentAssistHelper;
+import org.eclipse.jface.fieldassist.ContentProposalAdapter;
+import org.eclipse.jface.fieldassist.IContentProposalListener2;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.jface.resource.JFaceResources;
@@ -146,10 +149,11 @@
public void setPropertyEditor(PropertyEditor editor) {
propertyEditor = editor;
if(editor != null) {
- IContentAssistProcessor processor = (IContentAssistProcessor)editor.getAdapter(IContentAssistProcessor.class);
- if(processor != null) {
- ControlContentAssistHelper.createTextContentAssistant(text, processor);
- }
+ addContentAssist(text);
+// IContentAssistProcessor processor = (IContentAssistProcessor)editor.getAdapter(IContentAssistProcessor.class);
+// if(processor != null) {
+// ControlContentAssistHelper.createTextContentAssistant(text, processor);
+// }
}
}
@@ -169,6 +173,7 @@
text.addKeyListener(new KeyAdapter() {
public void keyPressed(KeyEvent e) {
if ((byte)e.character == (byte)13) { // Enter
+ if(popup.isPopupOpened) return;
fireApplyEditorValue();
fireCancelEditor();
}
@@ -257,7 +262,28 @@
}
else if(text != null && !text.isDisposed() && editable) text.forceFocus();
}
+
+ protected void addContentAssist(Text text) {
+ if(propertyEditor != null && propertyEditor.getInput() instanceof DefaultValueAdapter) {
+ DefaultValueAdapter valueAdapter = (DefaultValueAdapter)propertyEditor.getInput();
+ AttributeContentProposalProviderFactory.registerContentAssist(valueAdapter, text, popup);
+ }
+ }
+
+ CPL2 popup = new CPL2();
+ class CPL2 implements IContentProposalListener2 {
+ boolean isPopupOpened = false;
+
+ public void proposalPopupClosed(ContentProposalAdapter adapter) {
+ isPopupOpened = false;
+ }
+
+ public void proposalPopupOpened(ContentProposalAdapter adapter) {
+ isPopupOpened = true;
+ }
+ }
+
protected void fireCancelEditor() {
skipDeactivate = Boolean.TRUE.booleanValue();
super.fireCancelEditor();
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringEditor.java 2009-02-03 14:01:19 UTC (rev 13448)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringEditor.java 2009-02-03 14:09:04 UTC (rev 13449)
@@ -14,7 +14,10 @@
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.common.model.ui.attribute.AttributeContentProposalProviderFactory;
+import org.jboss.tools.common.model.ui.attribute.adapter.DefaultValueAdapter;
import org.jboss.tools.common.model.ui.widgets.IWidgetSettings;
public class StringEditor extends ValueEditor {
@@ -27,7 +30,11 @@
}
protected CellEditor createCellEditor(Composite parent) {
- return (cellEditor = new TextCellEditor(parent, SWT.NONE));
+ TextCellEditor t = new TextCellEditor(parent, SWT.NONE);
+ Text text = (Text)t.getControl();
+ DefaultValueAdapter valueAdapter = (DefaultValueAdapter)getInput();
+ AttributeContentProposalProviderFactory.registerContentAssist(valueAdapter, text);
+ return (cellEditor = t);
}
protected ExtendedFieldEditor createFieldEditor(Composite parent) {
15 years, 11 months
JBoss Tools SVN: r13448 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-02-03 09:01:19 -0500 (Tue, 03 Feb 2009)
New Revision: 13448
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3644
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css 2009-02-03 13:44:23 UTC (rev 13447)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/css/stylesRed.css 2009-02-03 14:01:19 UTC (rev 13448)
@@ -1,4 +1,4 @@
span {
- color: red;
-
-}
+ color: red;
+ background-color: #80FF00
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2009-02-03 13:44:23 UTC (rev 13447)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2009-02-03 14:01:19 UTC (rev 13448)
@@ -368,7 +368,9 @@
public void reload() {
try {
- model.reload(new FileInputStream(styleFile.getLocation().toFile()));
+ if(model.isDirty()) {
+ model.reload(new FileInputStream(styleFile.getLocation().toFile()));
+ }
} catch (Exception e) {
JspEditorPlugin.getPluginLog().logError(e.getMessage());
}
15 years, 11 months
JBoss Tools SVN: r13447 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-02-03 08:44:23 -0500 (Tue, 03 Feb 2009)
New Revision: 13447
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
Log:
JBIDE-3725
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java 2009-02-03 06:28:53 UTC (rev 13446)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreBuilder.java 2009-02-03 13:44:23 UTC (rev 13447)
@@ -90,6 +90,8 @@
if(sp.getClassPath().update()) {
sp.getClassPath().process();
+ } else if(sp.getClassPath().hasToUpdateProjectDependencies()) {
+ sp.getClassPath().validateProjectDependencies();
}
TypeInfoCollector.cleanCache();
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2009-02-03 06:28:53 UTC (rev 13446)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2009-02-03 13:44:23 UTC (rev 13447)
@@ -327,7 +327,7 @@
IPath[] ps = sourcePaths2.keySet().toArray(new IPath[0]);
for (int i = 0; i < ps.length; i++) {
IPath pth = ps[i];
- if(p.getSourcePath().isPrefixOf(pth)) {
+ if(p.getSourcePath().isPrefixOf(pth) || (p.isPathLoaded(pth) && !pth.toString().endsWith(".jar"))) {
pathRemoved(pth);
}
}
@@ -1011,6 +1011,10 @@
fireChanges(changes);
}
+ public boolean isPathLoaded(IPath source) {
+ return sourcePaths2.containsKey(source);
+ }
+
/**
* Package local method called by builder.
* @param source
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2009-02-03 06:28:53 UTC (rev 13446)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2009-02-03 13:44:23 UTC (rev 13447)
@@ -225,6 +225,30 @@
}
}
+ public boolean hasToUpdateProjectDependencies() {
+ List<SeamProject> ps = null;
+
+ try {
+ ps = getSeamProjects(project.getProject());
+ } catch (CoreException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ }
+ if(ps != null) {
+ Set<SeamProject> set = project.getSeamProjects();
+ Set<SeamProject> removable = new HashSet<SeamProject>();
+ removable.addAll(set);
+ removable.removeAll(ps);
+ ps.removeAll(set);
+ for (SeamProject p : ps) {
+ return true;
+ }
+ for (SeamProject p : removable) {
+ return true;
+ }
+ }
+ return false;
+ }
+
void componentsLoaded(LoadedDeclarations c, IPath path) {
if(c == null) return;
project.registerComponents(c, path);
15 years, 11 months
JBoss Tools SVN: r13446 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-03 01:28:53 -0500 (Tue, 03 Feb 2009)
New Revision: 13446
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
Log:
JBIDE-3622 fixed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2009-02-03 05:48:58 UTC (rev 13445)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2009-02-03 06:28:53 UTC (rev 13446)
@@ -116,11 +116,11 @@
args = ArgsUtil.setArg(args, "-c", "--configuration", config);
vmArgs= ArgsUtil.setArg(vmArgs, null, "-Djava.endorsed.dirs",
- "\"" + runtime.getRuntime().getLocation().append("lib").append("endorsed") + "\"");
+ "\"" + runtime.getRuntime().getLocation().append("lib").append("endorsed") + "\"", false);
if( runtime.getRuntime().getLocation().append("bin").append("native").toFile().exists() )
- vmArgs = ArgsUtil.setArg(vmArgs, "", "-Djava.library.path",
- "\"" + runtime.getRuntime().getLocation().append("bin").append("native") + "\"");
+ vmArgs = ArgsUtil.setArg(vmArgs, null, "-Djava.library.path",
+ "\"" + runtime.getRuntime().getLocation().append("bin").append("native") + "\"", false);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2009-02-03 05:48:58 UTC (rev 13445)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2009-02-03 06:28:53 UTC (rev 13446)
@@ -112,7 +112,12 @@
public static String setArg(String allArgs, String shortOpt, String longOpt, String value ) {
if( value.contains(" "))
value = "\"" + value + "\"";
-
+ return setArg(allArgs, shortOpt, longOpt, value, false);
+ }
+
+ public static String setArg(String allArgs, String shortOpt, String longOpt, String value, boolean addQuotes ) {
+ if( addQuotes )
+ value = "\"" + value + "\"";
String[] args = parse(allArgs);
String retVal = "";
for( int i = 0; i < args.length; i++ ) {
15 years, 11 months
JBoss Tools SVN: r13445 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-03 00:48:58 -0500 (Tue, 03 Feb 2009)
New Revision: 13445
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
Log:
JBIDE-3702 - index out of bounds in argutil
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2009-02-03 05:32:35 UTC (rev 13444)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2009-02-03 05:48:58 UTC (rev 13445)
@@ -53,7 +53,7 @@
public static String getValue(String[] args, String shortOpt, String longOpt ) {
for( int i = 0; i < args.length; i++ ) {
- if( args[i].equals(shortOpt))
+ if( args[i].equals(shortOpt) && i+1 < args.length)
return args[i+1];
if( longOpt != null && args[i].startsWith(longOpt + "="))
return args[i].substring(args[i].indexOf('=') + 1);
15 years, 11 months
JBoss Tools SVN: r13444 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-03 00:32:35 -0500 (Tue, 03 Feb 2009)
New Revision: 13444
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
Log:
JBIDE-3639 - editor not opening on old workspace due to root folder that doesn't exist - deploy locations also fixed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2009-02-02 23:15:23 UTC (rev 13443)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2009-02-03 05:32:35 UTC (rev 13444)
@@ -235,6 +235,7 @@
toolkit.paintBordersFor(composite);
section.setClient(composite);
+ getSaveStatus();
}
private String getDeployType() {
15 years, 11 months
JBoss Tools SVN: r13443 - in trunk: jsf/docs/jsf_tools_ref_guide/en and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-02-02 18:15:23 -0500 (Mon, 02 Feb 2009)
New Revision: 13443
Modified:
trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml
trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml
trunk/jsf/docs/userguide/en/master.xml
trunk/portlet/docs/reference/en/master.xml
trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/about.properties
Log:
[JBDS-611]
Modified: trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml
===================================================================
--- trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml 2009-02-02 23:13:28 UTC (rev 13442)
+++ trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml 2009-02-02 23:15:23 UTC (rev 13443)
@@ -12,7 +12,7 @@
<copyright>
JBoss, Home of Professional Open Source
-Copyright 2006, JBoss Inc., and individual contributors as indicated
+Copyright 2006-2009, JBoss, a division of Red Hat, and individual contributors as indicated
by the @authors tag. See the copyright.txt in the distribution
for a full listing of individual contributors.
</copyright>
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml 2009-02-02 23:13:28 UTC (rev 13442)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml 2009-02-02 23:15:23 UTC (rev 13443)
@@ -37,11 +37,11 @@
<pubdate>April 2008</pubdate>
<copyright>
<year>2007</year>
- <year>2008</year>
- <holder>JBoss, a division of Red Hat Inc.</holder>
+ <year>2009</year>
+ <holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.0.0.CR2
+ Version: 3.0.0.GA
</releaseinfo>
<abstract>
Modified: trunk/jsf/docs/userguide/en/master.xml
===================================================================
--- trunk/jsf/docs/userguide/en/master.xml 2009-02-02 23:13:28 UTC (rev 13442)
+++ trunk/jsf/docs/userguide/en/master.xml 2009-02-02 23:15:23 UTC (rev 13443)
@@ -32,11 +32,11 @@
<pubdate>April 2008</pubdate>
<copyright>
<year>2007</year>
- <year>2008</year>
- <holder>JBoss, a division of Red Hat Inc.</holder>
+ <year>2009</year>
+ <holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 2.0.0.CR2
+ Version: 2.0.0.GA
</releaseinfo>
<abstract>
<title/>
Modified: trunk/portlet/docs/reference/en/master.xml
===================================================================
--- trunk/portlet/docs/reference/en/master.xml 2009-02-02 23:13:28 UTC (rev 13442)
+++ trunk/portlet/docs/reference/en/master.xml 2009-02-02 23:15:23 UTC (rev 13443)
@@ -35,10 +35,11 @@
<pubdate>September 2008</pubdate>
<copyright>
<year>2008</year>
- <holder>JBoss, a division of Red Hat Inc.</holder>
+ <year>2009</year>
+ <holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 1.0.0.CR1
+ Version: 1.0.0.GA
</releaseinfo>
<abstract>
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.properties
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.properties 2009-02-02 23:13:28 UTC (rev 13442)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.properties 2009-02-02 23:15:23 UTC (rev 13443)
@@ -1,7 +1,2 @@
-blurb=JBoss Portlet\n\
-\n\
-Version: {featureVersion}\n\
-\n\
-(c) Copyright JBoss Inc. contributors and others 2004 - 2008. All rights reserved.\n\
-Visit http://jboss.org/tools
+blurb=JBoss Portlet\n\nVersion\: {featureVersion}\n\n(c) Copyright JBoss, a division of Red Hat, contributors and others 2004 - 2009. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/about.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/about.properties 2009-02-02 23:13:28 UTC (rev 13442)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/about.properties 2009-02-02 23:15:23 UTC (rev 13443)
@@ -1,7 +1,2 @@
-blurb=Smooks Tools\n\
-\n\
-Version: {featureVersion}\n\
-\n\
-(c) Copyright JBoss Inc. contributors and others 2004 - 2008. All rights reserved.\n\
-Visit http://jboss.org/tools
+blurb=Smooks Tools\n\nVersion\: {featureVersion}\n\n(c) Copyright JBoss, a division of Red Hat, contributors and others 2004 - 2009. All rights reserved.\nVisit http\://jboss.org/tools
15 years, 11 months