JBoss Tools SVN: r7814 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-04-25 10:35:51 -0400 (Fri, 25 Apr 2008)
New Revision: 7814
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesComposite.java
Log:
JBIDE-2066
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesComposite.java 2008-04-25 14:34:16 UTC (rev 7813)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/css/ResourceReferencesComposite.java 2008-04-25 14:35:51 UTC (rev 7814)
@@ -16,6 +16,10 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.XModelEntity;
+import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintFileFilter;
+import org.jboss.tools.common.meta.impl.XModelMetaDataImpl;
import org.jboss.tools.common.model.ui.action.CommandBar;
import org.jboss.tools.common.model.ui.action.CommandBarListener;
import org.jboss.tools.common.model.ui.objecteditor.XTable;
@@ -113,6 +117,7 @@
protected void add(int index) {
ResourceReference css = new ResourceReference("", ResourceReference.FOLDER_SCOPE);
+ initFilterInFileChooser();
boolean ok = VpeAddReferenceSupport.add(file, css, getReferenceArray(), getEntity());
if(!ok) return;
dataList.add(css);
@@ -123,6 +128,7 @@
protected void edit(int index) {
if(index < 0) return;
ResourceReference css = getReferenceArray()[index];
+ initFilterInFileChooser();
boolean ok = VpeAddReferenceSupport.edit(file, css, getReferenceArray(), getEntity());
if(!ok) return;
update();
@@ -147,6 +153,20 @@
private boolean canModify() {
return table.getSelectionIndex() >= 0;
}
+
+ private void initFilterInFileChooser() {
+ String entityName = getEntity();
+ XModelEntity entity = XModelMetaDataImpl.getInstance().getEntity(entityName);
+ if(entity != null && file != null && file.getProject() != null) {
+ XAttribute[] as = entity.getAttributes();
+ for (int i = 0; i < as.length; i++) {
+ if(as[i].getConstraint() instanceof XAttributeConstraintFileFilter) {
+ XAttributeConstraintFileFilter f = (XAttributeConstraintFileFilter)as[i].getConstraint();
+ f.getProperties().setProperty("filterFolder", file.getProject().getLocation().toFile().getAbsolutePath());
+ }
+ }
+ }
+ }
}
16 years, 1 month
JBoss Tools SVN: r7813 - 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: 2008-04-25 10:34:16 -0400 (Fri, 25 Apr 2008)
New Revision: 7813
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/FileChooserAdapter.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/FileFieldEditorEx.java
Log:
JBIDE-2066
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/FileChooserAdapter.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/FileChooserAdapter.java 2008-04-25 14:33:21 UTC (rev 7812)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/FileChooserAdapter.java 2008-04-25 14:34:16 UTC (rev 7813)
@@ -59,6 +59,12 @@
return filenames;
}
+ public String getFilterPath() {
+ XAttributeConstraintFileFilter c = (XAttributeConstraintFileFilter)attribute.getConstraint();
+ properties = c.getProperties();
+ return properties == null ? null : properties.getProperty("filterFolder");
+ }
+
public Object getAdapter(Class adapter) {
if(adapter.isAssignableFrom(getClass())) return this;
return super.getAdapter(adapter);
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/FileFieldEditorEx.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/FileFieldEditorEx.java 2008-04-25 14:33:21 UTC (rev 7812)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/FileFieldEditorEx.java 2008-04-25 14:34:16 UTC (rev 7813)
@@ -59,7 +59,17 @@
}
}
if(propertyEditor == null || propertyEditor.getValue() == null || propertyEditor.getValue().toString().trim().length() == 0) {
- if (lastPath != null && new File(lastPath).exists()) dialog.setFilterPath(lastPath);
+ if (lastPath != null && new File(lastPath).exists()) {
+ dialog.setFilterPath(lastPath);
+ } else {
+ FileChooserAdapter adapter = (FileChooserAdapter)propertyEditor.getAdapter(FileChooserAdapter.class);
+ if(adapter != null) {int oo;
+ String filterPath = adapter.getFilterPath();
+ if(filterPath != null && new File(filterPath).exists()) {
+ dialog.setFilterPath(filterPath);
+ }
+ }
+ }
}
if (extensions != null)
dialog.setFilterExtensions(extensions);
16 years, 1 month
JBoss Tools SVN: r7812 - branches/ganymede/trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-25 10:33:21 -0400 (Fri, 25 Apr 2008)
New Revision: 7812
Modified:
branches/ganymede/trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
Log:
JBIDE-2137 [Ganymede] JavaMoveRefactoring cannot be resolved to a type
Modified: branches/ganymede/trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java
===================================================================
--- branches/ganymede/trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-04-25 14:29:35 UTC (rev 7811)
+++ branches/ganymede/trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-04-25 14:33:21 UTC (rev 7812)
@@ -46,6 +46,7 @@
import org.eclipse.jdt.internal.ui.refactoring.reorg.RenameSelectionState;
import org.eclipse.jdt.ui.refactoring.RenameSupport;
import org.eclipse.ltk.core.refactoring.RefactoringCore;
+import org.eclipse.ltk.core.refactoring.participants.MoveRefactoring;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
@@ -392,7 +393,7 @@
} catch (JavaModelException e) {
JUnitUtils.fail("Exception during perform folder moving: " + folderPath, e);
}
- JavaMoveRefactoring refactoring = new JavaMoveRefactoring(processor);
+ MoveRefactoring refactoring = new MoveRefactoring(processor);
processor.setCreateTargetQueries(new ICreateTargetQueries(){
public ICreateTargetQuery createNewPackageQuery() {
return null;
16 years, 1 month
JBoss Tools SVN: r7811 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-04-25 10:29:35 -0400 (Fri, 25 Apr 2008)
New Revision: 7811
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java
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/template/VpeAbstractTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2092
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java 2008-04-25 14:25:13 UTC (rev 7810)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java 2008-04-25 14:29:35 UTC (rev 7811)
@@ -31,7 +31,6 @@
*/
public class JsfForm extends VpeAbstractTemplate {
- private static String STYLE_FOR_DIV = "border: 1px dotted #FF6600; padding: 5px;"; //$NON-NLS-1$
private static String TABLE_WIDTH_STYLE = "width: 100%;"; //$NON-NLS-1$
private static final String DIR_VALUE_RTL = "RTL"; //$NON-NLS-1$
@@ -63,7 +62,7 @@
nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE);
nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
- nsIDOMElement dotted_border_div = visualDocument.createElement(HTML.TAG_DIV);
+
nsIDOMElement content_div = visualDocument.createElement(HTML.TAG_DIV);
if (attrPresents(style)) {
@@ -79,9 +78,8 @@
}
table.setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, TABLE_WIDTH_STYLE);
- dotted_border_div.setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, STYLE_FOR_DIV);
- dotted_border_div.appendChild(content_div);
- td.appendChild(dotted_border_div);
+
+ td.appendChild(content_div);
tr.appendChild(td);
table.appendChild(tr);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java 2008-04-25 14:25:13 UTC (rev 7810)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSubView.java 2008-04-25 14:29:35 UTC (rev 7811)
@@ -31,7 +31,6 @@
*/
public class JsfSubView extends VpeAbstractTemplate {
- private static String STYLE_FOR_DIV = "border: 1px dotted #FF6600; padding: 5px;"; //$NON-NLS-1$
private static String TABLE_WIDTH_STYLE = "width: 100%;"; //$NON-NLS-1$
/**
@@ -52,7 +51,6 @@
nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV);
table.setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, TABLE_WIDTH_STYLE);
- div.setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, STYLE_FOR_DIV);
td.appendChild(div);
tr.appendChild(td);
table.appendChild(tr);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java 2008-04-25 14:25:13 UTC (rev 7810)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java 2008-04-25 14:29:35 UTC (rev 7811)
@@ -31,7 +31,6 @@
*/
public class JsfView extends VpeAbstractTemplate {
- private static String STYLE_FOR_DIV = "border: 1px dotted #FF6600; padding: 5px;"; //$NON-NLS-1$
private static String TABLE_WIDTH_STYLE = "width: 100%;"; //$NON-NLS-1$
/**
@@ -53,7 +52,6 @@
nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV);
table.setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, TABLE_WIDTH_STYLE);
- div.setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, STYLE_FOR_DIV);
td.appendChild(div);
tr.appendChild(td);
table.appendChild(tr);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-04-25 14:25:13 UTC (rev 7810)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-04-25 14:29:35 UTC (rev 7811)
@@ -616,7 +616,7 @@
</vpe:tag>
<vpe:tag name="f:view" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" haveVisualPreview="no"
+ <vpe:template children="yes" modify="yes" hasImaginaryBorder="yes"
class="org.jboss.tools.jsf.vpe.jsf.template.JsfView">
<vpe:dnd>
<vpe:drag start-enable="yes" />
@@ -641,7 +641,7 @@
</vpe:tag>
<vpe:tag name="f:subview" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" haveVisualPreview="no"
+ <vpe:template children="yes" modify="yes" hasImaginaryBorder="yes"
class="org.jboss.tools.jsf.vpe.jsf.template.JsfSubView">
<vpe:dnd>
<vpe:drag start-enable="yes" />
@@ -666,7 +666,7 @@
</vpe:tag>
<vpe:tag name="h:form" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" haveVisualPreview="no"
+ <vpe:template children="yes" modify="yes" hasImaginaryBorder="yes"
class="org.jboss.tools.jsf.vpe.jsf.template.JsfForm">
<vpe:dnd>
<vpe:drag start-enable="yes" />
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2008-04-25 14:25:13 UTC (rev 7810)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2008-04-25 14:29:35 UTC (rev 7811)
@@ -79,12 +79,7 @@
//FIX FOR JBIDE-1568, added by Max Areshkau
try {
- if ( template.isHaveVisualPreview() ) {
creationData = template.create(getPageContext(), sourceNode, getVisualDocument());
- } else {
- nsIDOMElement tempHTMLElement = getVisualDocument().createElement(HTML.TAG_DIV);
- creationData = new VpeCreationData(tempHTMLElement);
- }
}catch (XPCOMException ex) {
VpePlugin.getPluginLog().logError(ex);
VpeTemplate defTemplate = templateManager.getDefTemplate();
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 2008-04-25 14:25:13 UTC (rev 7810)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-04-25 14:29:35 UTC (rev 7811)
@@ -110,6 +110,7 @@
private static final int DRAG_AREA_WIDTH = 10;
private static final int DRAG_AREA_HEIGHT = 10;
private static final String ATTR_DRAG_AVAILABLE_CLASS = "__drag__available_style"; //$NON-NLS-1$
+ private static String DOTTED_BORDER = "border: 1px dotted #FF6600; padding: 5px;"; //$NON-NLS-1$
private MozillaEditor visualEditor;
private XulRunnerEditor xulRunnerEditor;
@@ -478,10 +479,20 @@
visualNewElement = (nsIDOMElement) creationData
.getNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
}
+
+ if ((visualNewElement != null) && template.hasImaginaryBorder()) {
+
+ visualNewElement.setAttribute(HTML.ATTR_STYLE, visualNewElement
+ .getAttribute(HTML.ATTR_STYLE)
+ + VpeStyleUtil.SEMICOLON_STRING + DOTTED_BORDER);
+
+ }
if (visualNewElement != null)
correctVisualAttribute(visualNewElement);
+
+
nsIDOMElement border = null;
setTooltip((Element) sourceNode, visualNewElement);
if (YES_STRING.equals(VpePreference.SHOW_BORDER_FOR_ALL_TAGS
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-04-25 14:25:13 UTC (rev 7810)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-04-25 14:29:35 UTC (rev 7811)
@@ -48,7 +48,7 @@
protected boolean children;
protected boolean modify;
- protected boolean haveVisualPreview;
+ protected boolean hasImaginaryBorder;
/** a resizer instance */
private VpeResizer resizer;
@@ -160,16 +160,17 @@
this.caseSensitive = caseSensitive;
children = "yes".equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_CHILDREN)); //$NON-NLS-1$
modify = "yes".equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_MODIFY)); //$NON-NLS-1$
-
- String strHaveVisualPreview = templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_HAVE_VISUAL_PREVIEW);
-
- if (strHaveVisualPreview != null && strHaveVisualPreview.length() != 0 ) {
- haveVisualPreview = "yes".equals(strHaveVisualPreview); //$NON-NLS-1$
+
+ String strHasImaginaryBorder = templateElement
+ .getAttribute(VpeTemplateManager.ATTR_TEMPLATE_HAS_IMAGINARY_BORDER);
+
+ if (strHasImaginaryBorder != null
+ && strHasImaginaryBorder.length() != 0) {
+ hasImaginaryBorder = "yes".equalsIgnoreCase(strHasImaginaryBorder); //$NON-NLS-1$
} else {
- haveVisualPreview = true;
+ hasImaginaryBorder = false;
}
-
-
+
init(templateElement);
}
@@ -928,8 +929,8 @@
return true;
}
- public boolean isHaveVisualPreview() {
- return haveVisualPreview;
+ public boolean hasImaginaryBorder() {
+ return hasImaginaryBorder;
}
/**
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2008-04-25 14:25:13 UTC (rev 7810)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2008-04-25 14:29:35 UTC (rev 7811)
@@ -307,32 +307,10 @@
boolean isCaseSensitive();
/**
- * Return <code>true</code> if the element has visual representation on tab
- * 'Preview', otherwise <code>false</code>.<br/>
- * This value is initialized by attribute <b>haveVisualPreview</b> of tag
- * <b><vpe:template></b>. If the attribute is not presented default
- * value is <code>true</code>.<br/>
- * <br/>
- * Example:<br/>
- * JSF tag <code><h:form></code>:<br/>
- * <code>
- * <vpe:tag name="h:form" case-sensitive="yes"><br/>
- * <vpe:template children="yes" modify="yes" haveVisualPreview="no"><br/>
- * <div style="border:1px dotted #FF6600;padding: 5px;" title="{tagstring()}"/><br/>
- * <vpe:dnd><br/>
- * <vpe:drag start-enable="yes"/><br/>
- * <vpe:drop container="yes"/><br/>
- * </vpe:dnd><br/>
- * </vpe:template><br/>
- * </vpe:tag><br/>
- * </code><br/>
- * In visual editor part (see tab 'Visual') the tag have a red border for
- * visualization reason, but it is not visual element and it shouldn't have
- * visual representation on tab 'Preview'.<br/>
- * <br/>
- * @return <code>true</code> if the element is have visual preview
+ *
+ * @return
*/
- boolean isHaveVisualPreview();
+ boolean hasImaginaryBorder();
/**
* Returns the data for formatting an element of source tree
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-04-25 14:25:13 UTC (rev 7810)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-04-25 14:29:35 UTC (rev 7811)
@@ -133,8 +133,7 @@
static final String ATTR_TEMPLATE_CHILDREN = "children"; //$NON-NLS-1$
static final String ATTR_TEMPLATE_MODIFY = "modify"; //$NON-NLS-1$
- /** ATTR_TEMPLATE_HAVE_VISUAL_PREVIEW */
- static final String ATTR_TEMPLATE_HAVE_VISUAL_PREVIEW = "haveVisualPreview"; //$NON-NLS-1$
+ static final String ATTR_TEMPLATE_HAS_IMAGINARY_BORDER = "hasImaginaryBorder"; //$NON-NLS-1$
static final String ATTR_COPY_ATTRS = "attrs"; //$NON-NLS-1$
16 years, 1 month
JBoss Tools SVN: r7810 - branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-25 10:25:13 -0400 (Fri, 25 Apr 2008)
New Revision: 7810
Modified:
branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java
Log:
JBIDE-2136 [Ganymede] ICommandImageService cannot be resolved to a type
Modified: branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java
===================================================================
--- branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java 2008-04-25 14:21:08 UTC (rev 7809)
+++ branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java 2008-04-25 14:25:13 UTC (rev 7810)
@@ -17,7 +17,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.internal.commands.ICommandImageService;
+import org.eclipse.ui.commands.ICommandImageService;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.osgi.framework.Bundle;
16 years, 1 month
JBoss Tools SVN: r7809 - branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-25 10:21:08 -0400 (Fri, 25 Apr 2008)
New Revision: 7809
Modified:
branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java
Log:
JBIDE-2135 [Ganymede] The type StatusLineContributionItem is ambiguous
Modified: branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java
===================================================================
--- branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java 2008-04-25 14:19:42 UTC (rev 7808)
+++ branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java 2008-04-25 14:21:08 UTC (rev 7809)
@@ -23,6 +23,7 @@
import org.eclipse.ui.ide.IDEActionFactory;
import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
import org.eclipse.ui.texteditor.*;
+import org.eclipse.ui.texteditor.StatusLineContributionItem;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.commands.ActionHandler;
import org.eclipse.jface.text.IRegion;
16 years, 1 month
JBoss Tools SVN: r7808 - branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-25 10:19:42 -0400 (Fri, 25 Apr 2008)
New Revision: 7808
Modified:
branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java
Log:
JBIDE-2134 [Ganymede] ClosableWizardDialog cannot be resolved to a type
Modified: branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java
===================================================================
--- branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java 2008-04-25 14:14:32 UTC (rev 7807)
+++ branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java 2008-04-25 14:19:42 UTC (rev 7808)
@@ -32,7 +32,9 @@
import org.jboss.tools.common.model.ui.attribute.editor.MutableComboBoxFieldEditor;
import org.jboss.tools.common.model.ui.attribute.editor.MutableMultipleChoiceFieldEditor;
import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+
import org.jboss.tools.common.meta.action.SpecialWizard;
import org.jboss.tools.common.meta.action.XEntityData;
import org.jboss.tools.common.meta.action.impl.XEntityDataImpl;
@@ -357,7 +359,8 @@
private IServer newServer(Shell shell) {
NewServerWizard wizard = new NewServerWizard();
- ClosableWizardDialog dialog = new ClosableWizardDialog(shell, wizard);
+ WizardDialog dialog = new WizardDialog(shell, wizard);
+
if (dialog.open() == Window.CANCEL) {
return null;
}
@@ -396,7 +399,7 @@
};
TaskWizard wizard = new TaskWizard(title, fragment);
wizard.setForcePreviousAndNextButtons(true);
- ClosableWizardDialog dialog = new ClosableWizardDialog(shell, wizard);
+ WizardDialog dialog = new WizardDialog(shell, wizard);
int result = dialog.open();
if(Window.OK != result) return null;
return (IRuntime)wizard.getRootFragment().getTaskModel().getObject(TaskModel.TASK_RUNTIME);
16 years, 1 month
JBoss Tools SVN: r7807 - branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-25 10:14:32 -0400 (Fri, 25 Apr 2008)
New Revision: 7807
Modified:
branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java
Log:
JBIDE-2134 [Ganymede] ClosableWizardDialog cannot be resolved to a type
Modified: branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java
===================================================================
--- branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java 2008-04-25 13:58:26 UTC (rev 7806)
+++ branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java 2008-04-25 14:14:32 UTC (rev 7807)
@@ -129,7 +129,7 @@
private void newServer() {
NewServerWizard wizard = new NewServerWizard();
- ClosableWizardDialog dialog = new ClosableWizardDialog(window.getShell(), wizard);
+ WizardDialog dialog = new WizardDialog(window.getShell(), wizard);
if (dialog.open() != Window.CANCEL) {
IServer server = (IServer)wizard.getRootFragment().getTaskModel().getObject(TaskModel.TASK_SERVER);
if(server != null) {
16 years, 1 month
JBoss Tools SVN: r7806 - in branches/ganymede/trunk: jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-25 09:58:26 -0400 (Fri, 25 Apr 2008)
New Revision: 7806
Modified:
branches/ganymede/trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFContextMenuProvider.java
branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesContextMenuProvider.java
branches/ganymede/trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/StrutsContextMenuProvider.java
Log:
JBIDE-2133 [Ganymede] Cannot reduce the visibility of the inherited method from MenuManager
Modified: branches/ganymede/trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFContextMenuProvider.java
===================================================================
--- branches/ganymede/trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFContextMenuProvider.java 2008-04-25 13:56:39 UTC (rev 7805)
+++ branches/ganymede/trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFContextMenuProvider.java 2008-04-25 13:58:26 UTC (rev 7806)
@@ -55,11 +55,7 @@
private void setActionRegistry(ActionRegistry registry) {
actionRegistry = registry;
}
-
- private boolean menuExist() {
- return getMenu() != null && !getMenu().isDisposed();
- }
-
+
protected void update(boolean force, boolean recursive) {
if(!isDirty() && !force) return;
if(!menuExist()) return;
Modified: branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesContextMenuProvider.java
===================================================================
--- branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesContextMenuProvider.java 2008-04-25 13:56:39 UTC (rev 7805)
+++ branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesContextMenuProvider.java 2008-04-25 13:58:26 UTC (rev 7806)
@@ -57,10 +57,7 @@
actionRegistry = registry;
}
- private boolean menuExist() {
- return getMenu() != null && !getMenu().isDisposed();
- }
-
+
protected void update(boolean force, boolean recursive) {
if(!isDirty() && !force) return;
if(!menuExist()) return;
Modified: branches/ganymede/trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/StrutsContextMenuProvider.java
===================================================================
--- branches/ganymede/trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/StrutsContextMenuProvider.java 2008-04-25 13:56:39 UTC (rev 7805)
+++ branches/ganymede/trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/StrutsContextMenuProvider.java 2008-04-25 13:58:26 UTC (rev 7806)
@@ -59,11 +59,7 @@
private void setActionRegistry(ActionRegistry registry) {
// actionRegistry = registry;
}
-
- private boolean menuExist() {
- return getMenu() != null && !getMenu().isDisposed();
- }
-
+
protected void update(boolean force, boolean recursive) {
if(!isDirty() && !force) return;
if(!menuExist()) return;
16 years, 1 month
JBoss Tools SVN: r7805 - trunk/documentation/guides/GettingStartedGuide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: afedosik
Date: 2008-04-25 09:56:39 -0400 (Fri, 25 Apr 2008)
New Revision: 7805
Modified:
trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-305 The requirement for run console updated.
Modified: trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml 2008-04-25 13:48:07 UTC (rev 7804)
+++ trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml 2008-04-25 13:56:39 UTC (rev 7805)
@@ -188,7 +188,7 @@
</listitem>
<listitem>
<para>Run in console:</para>
- <programlisting role="JAVA"><![CDATA[java -jar jbdevstudio-linux-gtk-1.0.0.GA.jar
+ <programlisting role="JAVA"><![CDATA[java -jar jbdevstudio-linux-gtk-1.1.0.CR1.jar
]]></programlisting>
</listitem>
<listitem>
16 years, 1 month