JBoss Tools SVN: r25092 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-22 09:46:54 -0400 (Wed, 22 Sep 2010)
New Revision: 25092
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarFolderImpl.java
Log:
JBIDE-3875
https://jira.jboss.org/browse/JBIDE-3875
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarFolderImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarFolderImpl.java 2010-09-22 13:16:23 UTC (rev 25091)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarFolderImpl.java 2010-09-22 13:46:54 UTC (rev 25092)
@@ -58,13 +58,17 @@
JarAccess jar = getJarSystem().getJarAccess();
if(!jar.isLoaded()) return;
jar.lockJar();
- loaded = true;
String path = getAbsolutePath();
String[] cs = jar.getChildren(path);
Properties p = new Properties();
- for (int i = 0; i < cs.length; i++) {
+ for (int i = 0; i < cs.length && !loaded; i++) {
boolean d = cs[i].endsWith(XModelObjectConstants.SEPARATOR);
if(d) cs[i] = cs[i].substring(0, cs[i].length() - 1);
+
+ if(children.getObject(FilePathHelper.toPathPath(cs[i])) != null) {
+ continue;
+ }
+
if(d) {
p.clear();
p.setProperty(XModelObjectConstants.ATTR_NAME, cs[i]);
@@ -76,6 +80,7 @@
}
fire = true;
jar.unlockJar();
+ loaded = true;
}
private void createFileObject(JarAccess jar, String path, String name) {
15 years, 7 months
JBoss Tools SVN: r25091 - trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-09-22 09:16:23 -0400 (Wed, 22 Sep 2010)
New Revision: 25091
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF
Log:
Fix for build issue
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-09-22 13:03:39 UTC (rev 25090)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-09-22 13:16:23 UTC (rev 25091)
@@ -36,7 +36,7 @@
org.eclipse.osgi,
org.eclipse.jst.ws.annotations.core,
org.apache.commons.codec,
- javax.xml.soap;version="1.2.0"
+ javax.xml.soap
Bundle-ActivationPolicy: lazy
Export-Package: javax.ws.rs,
javax.ws.rs.core,
15 years, 7 months
JBoss Tools SVN: r25090 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-22 09:03:39 -0400 (Wed, 22 Sep 2010)
New Revision: 25090
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
Log:
ext string parametr has been added JBIDE-7059
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2010-09-22 12:55:03 UTC (rev 25089)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2010-09-22 13:03:39 UTC (rev 25090)
@@ -74,7 +74,7 @@
*/
public class SelectionBar extends Composite implements ISelectionChangedListener, IStateListener,ICommandListener{
private static final int SEL_ITEM_RIGHT_MARGIN = 5;
- public static final String SELECTION_BAR_CONTEXT_ID="org.jboss.tools.jst.jsp.selectionBar.context";
+ public static final String SELECTION_BAR_CONTEXT_ID="org.jboss.tools.jst.jsp.selectionBar.context"; //$NON-NLS-1$
/*
* The main composite that holds all other controls
*/
15 years, 7 months
JBoss Tools SVN: r25089 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-09-22 08:55:03 -0400 (Wed, 22 Sep 2010)
New Revision: 25089
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
Log:
https://jira.jboss.org/browse/JBIDE-7059 , Selection Bar creation was updated.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2010-09-22 12:49:13 UTC (rev 25088)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2010-09-22 12:55:03 UTC (rev 25089)
@@ -54,7 +54,7 @@
*/
public abstract class JSPMultiPageEditorPart extends EditorPart {
- private CTabFolder container;
+ private CTabFolder tabFolderContainer;
private ArrayList nestedEditors = new ArrayList(3);
@@ -90,20 +90,33 @@
editor.init(site, input);
parent2 = new Composite(getContainer(), SWT.NONE);
ppp = parent2;
+ GridLayout gridLayout = new GridLayout(2, false);
+ gridLayout.marginHeight = 0;
+ gridLayout.marginWidth = 0;
+ gridLayout.horizontalSpacing = 0;
+ gridLayout.verticalSpacing = 0;
+ parent2.setLayout(gridLayout);
+
if(editor==sourcePart){
- //case when only source part available
+ /*
+ * In the case when only the source part is available
+ */
Composite editorComp = new Composite(parent2, SWT.NONE);
- editorComp.setLayout(new FillLayout());
- GridData editorGD=new GridData(GridData.FILL_BOTH);
- editorGD.horizontalSpan=2;
- editorComp.setLayoutData(editorGD);
+ GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
+ gd.horizontalSpan = 2;
+ editorComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ editorComp.setLayout(new FillLayout(SWT.VERTICAL));
editor.createPartControl(editorComp);
}else {
editor.createPartControl(parent2);
}
- parent2.setLayout(new GridLayout(2, false));
- selectionBar = new SelectionBar(sourcePart);
- selectionBar.createToolBarComposite(parent2);
+ /*
+ * Create Selection Bar Composite and set its layout
+ */
+ selectionBar = new SelectionBar(sourcePart, parent2, SWT.NONE);
+ selectionBar.setLayout(new GridLayout(1, false));
+ selectionBar.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, 1));
+
editor.addPropertyListener(new IPropertyListener() {
public void propertyChanged(Object source, int propertyId) {
JSPMultiPageEditorPart.this
@@ -149,7 +162,7 @@
protected abstract void createPages();
public final void createPartControl(Composite parent) {
- this.container = createContainer(parent);
+ this.tabFolderContainer = createContainer(parent);
createPages();
// set the active page (page 0 by default), unless it has already been
// done
@@ -184,7 +197,7 @@
}
protected Composite getContainer() {
- return container;
+ return tabFolderContainer;
}
protected Control getControl(int pageIndex) {
@@ -223,7 +236,7 @@
}
protected CTabFolder getTabFolder() {
- return container;
+ return tabFolderContainer;
}
protected void handlePropertyChange(int propertyId) {
15 years, 7 months
JBoss Tools SVN: r25088 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-09-22 08:49:13 -0400 (Wed, 22 Sep 2010)
New Revision: 25088
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
Log:
https://jira.jboss.org/browse/JBIDE-7059 , Selection Bar was changed to impelement SWT Composite directly.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2010-09-22 12:35:19 UTC (rev 25087)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2010-09-22 12:49:13 UTC (rev 25088)
@@ -65,69 +65,78 @@
/**
* This class create and manage the Selection Bar under the VPE.
- * Entry point from the class MozilaEditor This bar can be hiden and
- * shown it uses splitter for this.
+ * Entry point from the class MozilaEditor
+ * This bar can be hidden or shown.
*
* @author erick
* @author yradtsevich
* @author mareshkau
*/
-public class SelectionBar implements ISelectionChangedListener, IStateListener,ICommandListener{
- /**
- *
- */
+public class SelectionBar extends Composite implements ISelectionChangedListener, IStateListener,ICommandListener{
private static final int SEL_ITEM_RIGHT_MARGIN = 5;
-
public static final String SELECTION_BAR_CONTEXT_ID="org.jboss.tools.jst.jsp.selectionBar.context";
-
+ /*
+ * The main composite that holds all other controls
+ */
private Splitter splitter;
+ /*
+ * The SWT ToolBar that contains items with tag names
+ */
+ private ToolBar toolbar = null;
+ /*
+ * Composite that contains visible toolbar
+ */
+ private Composite realBar = null;
+ /*
+ * Composite to represent invisible toolbar
+ */
+ private Composite emptyBar = null;
private boolean resizeListenerAdded = false;
- private ToolBar selBar = null;
- private FormData selBarData;
-// private Composite closeBar = null;
+ private FormData toolbarData;
private Menu dropDownMenu = null;
private int itemCount = 0;
-// private Composite arrowBar;
- private Composite cmpToolBar = null;
- private Composite cmpTlEmpty = null;
private StructuredTextEditor textEditor;
- //Selection Bar State
+ private Node currentSelectedNode = null;
+ private Node currentLastNode = null;
+ /*
+ * Selection Bar State
+ */
private State toggleSelBarState;
private Command toggleSelBarCommand;
+ private ImageButton arrowButton;
- public SelectionBar(StructuredTextEditor textEditor) {
- super();
+ public SelectionBar(StructuredTextEditor textEditor, Composite parent,
+ int style) {
+ super(parent, style);
this.textEditor = textEditor;
this.textEditor.getTextViewer().addSelectionChangedListener(this);
-
- ICommandService commandService =
- (ICommandService) PlatformUI.getWorkbench()
- .getService(ICommandService.class);
- this.toggleSelBarCommand = commandService.getCommand(
- "org.jboss.tools.jst.jsp.commands.showSelectionBar"); //$NON-NLS-1$
- toggleSelBarState= toggleSelBarCommand
- .getState("org.eclipse.ui.commands.toggleState"); //$NON-NLS-1$
- toggleSelBarState.addListener(this);
+
+ ICommandService commandService = (ICommandService) PlatformUI
+ .getWorkbench().getService(ICommandService.class);
+ this.toggleSelBarCommand = commandService
+ .getCommand("org.jboss.tools.jst.jsp.commands.showSelectionBar"); //$NON-NLS-1$
+ toggleSelBarState = toggleSelBarCommand
+ .getState("org.eclipse.ui.commands.toggleState"); //$NON-NLS-1$
+ toggleSelBarState.addListener(this);
toggleSelBarCommand.addCommandListener(this);
+ /*
+ * Create the Selection Bar Composite in its constructor
+ */
+ createToolBarComposite();
}
-
- /**
- * Visibility state of the {@code SelectionBar}.
- */
- //private boolean visible;
-
- private ImageButton arrowButton;
- private Node currentSelectedNode = null;
- private Node currentLastNode = null;
-
- public Composite createToolBarComposite(Composite parent) {
- splitter = new Splitter(parent, SWT.NONE);
- splitter.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ public Composite createToolBarComposite() {
/*
- * The empty composite
+ * The parent of all children should be 'this' composite
*/
- cmpTlEmpty = new Composite(splitter, SWT.NONE) {
+ splitter = new Splitter(this, SWT.NONE);
+ splitter.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false));
+ /*
+ * The invisible Selection Bar that is used to handle
+ * show/hide Selection Bar actions.
+ */
+ emptyBar = new Composite(splitter, SWT.NONE) {
@Override
public Point computeSize(int wHint, int hHint, boolean changed) {
Point point = super.computeSize(wHint, hHint, changed);
@@ -135,13 +144,14 @@
return point;
}
};
+ emptyBar.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- cmpTlEmpty.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ /*
+ * Visible Composite that contains all other Selection Bar controls
+ */
+ realBar = new Composite(splitter, SWT.NONE);
+ realBar.setLayout(new FormLayout());
- // Main composite of the visible splitter
- cmpToolBar = new Composite(splitter, SWT.NONE);
- cmpToolBar.setLayout(new FormLayout());
-
final Image closeImage = PlatformUI.getWorkbench().getSharedImages()
.getImage(ISharedImages.IMG_TOOL_DELETE);
@@ -155,7 +165,7 @@
}
};
- ImageButton closeButton = new ImageButton(cmpToolBar, closeImage,
+ ImageButton closeButton = new ImageButton(realBar, closeImage,
JstUIMessages.HIDE_SELECTION_BAR);
closeButton.addSelectionListener(closeListener);
FormData closeBarData = new FormData();
@@ -164,16 +174,18 @@
Composite closeItemComposite = closeButton.getComposite();
closeItemComposite.setLayoutData(closeBarData);
- // Create selection bar
- selBar = new ToolBar(cmpToolBar, SWT.HORIZONTAL | SWT.FLAT | SWT.NO_BACKGROUND);
- selBarData = new FormData();
- selBarData.left = new FormAttachment(0);
- selBarData.right = new FormAttachment(closeItemComposite, 0, SWT.LEFT);
- selBarData.top = new FormAttachment(0);
- selBar.setLayoutData(selBarData);
+ /*
+ * Create tool bar that will contain nodes from the source editor
+ */
+ toolbar = new ToolBar(realBar, SWT.HORIZONTAL | SWT.FLAT | SWT.NO_BACKGROUND);
+ toolbarData = new FormData();
+ toolbarData.left = new FormAttachment(0);
+ toolbarData.right = new FormAttachment(closeItemComposite, 0, SWT.LEFT);
+ toolbarData.top = new FormAttachment(0);
+ toolbar.setLayoutData(toolbarData);
createArrowButton();
- cmpToolBar.layout();
- splitter.getParent().layout(true, true);
+ realBar.layout();
+ this.getParent().layout(true, true);
setVisible(toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue());
return splitter;
}
@@ -184,13 +196,13 @@
*/
public void setVisible(boolean visible) {
if (visible) {
- splitter.setVisible(cmpToolBar, true);
- splitter.setVisible(cmpTlEmpty, false);
+ splitter.setVisible(realBar, true);
+ splitter.setVisible(emptyBar, false);
} else {
- splitter.setVisible(cmpToolBar, false);
- splitter.setVisible(cmpTlEmpty, true);
+ splitter.setVisible(realBar, false);
+ splitter.setVisible(emptyBar, true);
}
- splitter.getParent().layout(true, true);
+ this.getParent().layout(true, true);
}
@@ -229,7 +241,7 @@
setSelBarItems(node);
currentLastNode = node;
}
-
+
setNodeSelected(node, true);
currentSelectedNode = node;
}
@@ -238,7 +250,7 @@
* Sets the selection state of the given node in the selection bar.
*/
private void setNodeSelected(Node node, boolean selected) {
- for (ToolItem item : selBar.getItems()) {
+ for (ToolItem item : toolbar.getItems()) {
if (item.getData() == node) {
item.setSelection(selected);
return;
@@ -258,16 +270,16 @@
}
/**
- * Cleans {@link #selBar} and adds to it buttons which
+ * Cleans {@link #toolbar} and adds to it buttons which
* appropriate the {@code node} and all its ancestors.
*/
private void setSelBarItems(Node node) {
// bug was fixed when toolbar are not shown for resizeble components
- cmpToolBar.layout();
- splitter.getParent().layout(true, true);
+ realBar.layout();
+ this.getParent().layout(true, true);
removeNodeListenerFromAllNodes();
- cleanToolBar(selBar);
+ cleanToolBar(toolbar);
disposeDropDownMenu();
// for now dropDownMenu = null
@@ -294,7 +306,7 @@
* for the last tag -- show check button
*/
if ((elementCounter == 0) && (list.size() == 0)){
- item = new ToolItem(selBar, SWT.FLAT | SWT.CHECK, 1);
+ item = new ToolItem(toolbar, SWT.FLAT | SWT.CHECK, 1);
item.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
handleSelectionEvent(e);
@@ -307,7 +319,7 @@
/*
* Create DropDownMenu button
*/
- item = new ToolItem(selBar, SWT.DROP_DOWN, 1);
+ item = new ToolItem(toolbar, SWT.DROP_DOWN, 1);
final DropdownSelectionListener dropdownListener = new DropdownSelectionListener(
item, list);
item.addSelectionListener(dropdownListener);
@@ -327,9 +339,9 @@
* When the item does not fit to the bar --
* put it to the DDM
*/
- if (!isItemShown(selBar.getItem(elementCounter + 1))) {
+ if (!isItemShown(toolbar.getItem(elementCounter + 1))) {
item.dispose();
- dropDownMenu = new Menu(selBar);
+ dropDownMenu = new Menu(toolbar);
}
}
@@ -369,7 +381,7 @@
}
if (!resizeListenerAdded ) {
- cmpToolBar.addListener(SWT.Resize, new Listener() {
+ realBar.addListener(SWT.Resize, new Listener() {
public void handleEvent(Event event) {
updateNodes(true);
}
@@ -415,21 +427,21 @@
final Image hoverImage = WorkbenchImages.getImage(
IWorkbenchGraphicConstants.IMG_LCL_RENDERED_VIEW_MENU);
- arrowButton = new ImageButton(selBar, hoverImage,
+ arrowButton = new ImageButton(toolbar, hoverImage,
JstUIMessages.SelectionBar_MoreNodes);
arrowButton.setEnabled(false);
arrowButton.addSelectionListener(
new Listener() {
public void handleEvent(Event event) {
Rectangle bounds = arrowButton.getButtonBounds();
- Point point = selBar.toDisplay(bounds.x, bounds.y
+ Point point = toolbar.toDisplay(bounds.x, bounds.y
+ bounds.height);
dropDownMenu.setLocation(point);
dropDownMenu.setVisible(true);
}
});
- ToolItem arrowItem = new ToolItem(selBar, SWT.SEPARATOR, 0);
+ ToolItem arrowItem = new ToolItem(toolbar, SWT.SEPARATOR, 0);
Composite arrowButtonComposite = arrowButton.getComposite();
arrowItem.setControl(arrowButtonComposite);
arrowButtonComposite.pack();
@@ -498,8 +510,8 @@
splitter.dispose();
splitter = null;
}
-
disposeDropDownMenu();
+ super.dispose();
}
/**
@@ -534,8 +546,8 @@
public String toString() {
StringBuffer st = new StringBuffer("CountItem: "); //$NON-NLS-1$
st.append(itemCount);
- st.append(" Parent Composite: " + cmpToolBar.getBounds().width); //$NON-NLS-1$
- st.append(" Bar : " + selBar.getBounds().width); //$NON-NLS-1$
+ st.append(" Parent Composite: " + realBar.getBounds().width); //$NON-NLS-1$
+ st.append(" Bar : " + toolbar.getBounds().width); //$NON-NLS-1$
return st.toString();
}
15 years, 7 months
JBoss Tools SVN: r25087 - trunk/jst/plugins/org.jboss.tools.jst.jsp.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-09-22 08:35:19 -0400 (Wed, 22 Sep 2010)
New Revision: 25087
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
Log:
JBIDE-7061 : Code completion for EL inserts unnecessary #{}
Issue is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-09-22 12:32:17 UTC (rev 25086)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-09-22 12:35:19 UTC (rev 25087)
@@ -741,6 +741,16 @@
categoryId="org.jboss.tools.jst.jsp.proposalCategory.xmlEL"
class="org.jboss.tools.jst.jsp.contentassist.computers.XmlELCompletionProposalComputer"
id="org.jboss.tools.jst.jsp.proposalComputer.xmlEL">
+ <contentType id="org.eclipse.core.runtime.xml">
+ <partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
+ <partitionType id="org.eclipse.wst.xml.XML_CDATA" />
+ <partitionType id="org.eclipse.wst.xml.XML_PI" />
+ <partitionType id="org.eclipse.wst.xml.XML_DECL" />
+ <partitionType id="org.eclipse.wst.xml.XML_COMMENT" />
+ <partitionType id="org.eclipse.wst.xml.dtd.internal_subset" />
+ <partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
+ <partitionType id="org.eclipse.wst.sse.UNKNOWN_PARTITION_TYPE" />
+ </contentType>
<contentType id="org.eclipse.wst.xml.core.xmlsource">
<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
<partitionType id="org.eclipse.wst.xml.XML_CDATA" />
15 years, 7 months
JBoss Tools SVN: r25086 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-09-22 08:32:17 -0400 (Wed, 22 Sep 2010)
New Revision: 25086
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
Log:
JBIDE-7061 : Code completion for EL inserts unnecessary #{}
Issue is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2010-09-22 12:20:03 UTC (rev 25085)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2010-09-22 12:32:17 UTC (rev 25086)
@@ -736,13 +736,24 @@
* @return
*/
protected TextRegion getELPrefix(ContentAssistRequest request) {
- if (!DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(request.getRegion().getType()) &&
- !DOMRegionContext.XML_CONTENT.equals(request.getRegion().getType()) &&
- !DOMRegionContext.BLOCK_TEXT.equals(request.getRegion().getType()))
+ if (request == null || request.getRegion() == null)
return null;
+
+ IStructuredDocumentRegion documentRegion = request.getDocumentRegion();
+ ITextRegion completionRegion = request.getRegion();
+ String regionType = completionRegion.getType();
- String text = request.getDocumentRegion().getFullText(request.getRegion());
- int startOffset = request.getDocumentRegion().getStartOffset() + request.getRegion().getStart();
+ if (DOMRegionContext.XML_END_TAG_OPEN.equals(regionType) || DOMRegionContext.XML_TAG_OPEN.equals(regionType)) {
+ documentRegion = documentRegion.getPrevious();
+ completionRegion = getCompletionRegion(request.getDocumentRegion().getStartOffset() + request.getRegion().getStart() - 1, request.getParent());
+ }
+ if (!DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(completionRegion.getType()) &&
+ !DOMRegionContext.XML_CONTENT.equals(completionRegion.getType()) &&
+ !DOMRegionContext.BLOCK_TEXT.equals(completionRegion.getType())) {
+ return null;
+ }
+ String text = documentRegion.getFullText(completionRegion);
+ int startOffset = documentRegion.getStartOffset() + completionRegion.getStart();
boolean isAttributeValue = false;
boolean hasOpenQuote = false;
15 years, 7 months
JBoss Tools SVN: r25085 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-22 08:20:03 -0400 (Wed, 22 Sep 2010)
New Revision: 25085
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
Log:
removed unused messages JBIDE-7059
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java 2010-09-22 12:07:05 UTC (rev 25084)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java 2010-09-22 12:20:03 UTC (rev 25085)
@@ -126,7 +126,6 @@
public static String CONFIRM_SELECTION_BAR_DIALOG_TITLE;
public static String CONFIRM_SELECTION_BAR_DIALOG_MESSAGE;
public static String CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE;
- public static String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR;
public static String SelectionBar_MoreNodes;
public static String HIDE_SELECTION_BAR;
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2010-09-22 12:07:05 UTC (rev 25084)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2010-09-22 12:20:03 UTC (rev 25085)
@@ -21,7 +21,6 @@
ADD_FONT_FAMILY_TIP=Add font family
REMOVE_FONT_FAMILY_TIP=Remove font family
-FaceletPageContectAssistProcessor_NewELExpression=New JSF EL Expression - Create a new text with #{}
FaceletPageContectAssistProcessor_NewELExpressionTextInfo=#{}
FONT_FAMILY_DIALOG_TITLE=Choose font family
BUTTON_APPLY=Apply
15 years, 7 months
JBoss Tools SVN: r25084 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-09-22 08:07:05 -0400 (Wed, 22 Sep 2010)
New Revision: 25084
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java
Log:
JBIDE-6901
DONE
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2010-09-22 11:41:44 UTC (rev 25083)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2010-09-22 12:07:05 UTC (rev 25084)
@@ -49,6 +49,7 @@
import org.jboss.tools.smooks.configuration.editors.javabean12.JavabeanlabelProvider;
import org.jboss.tools.smooks.configuration.editors.uitls.JavaTypeFieldDialog;
import org.jboss.tools.smooks.configuration.editors.uitls.ProjectClassLoader;
+import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
/**
* @author Dart
@@ -271,6 +272,9 @@
private boolean containts(Object model) {
if (model instanceof JavaBeanModel) {
Class clazz = ((JavaBeanModel) model).getBeanClass();
+ if(JavaBeanModelFactory.isPrimitiveObject(clazz)){
+ return false;
+ }
return modelClassStringList.contains(clazz);
}
return false;
15 years, 7 months
JBoss Tools SVN: r25083 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test: src/org/jboss/tools/jst/jsp/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-22 07:41:44 -0400 (Wed, 22 Sep 2010)
New Revision: 25083
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1791Test/WebContent/pages/selectionBar.xhtml
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/SelectionBarTest.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
Log:
junit test for JBIDE-7059
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1791Test/WebContent/pages/selectionBar.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1791Test/WebContent/pages/selectionBar.xhtml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1791Test/WebContent/pages/selectionBar.xhtml 2010-09-22 11:41:44 UTC (rev 25083)
@@ -0,0 +1 @@
+test page
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2010-09-22 10:54:39 UTC (rev 25082)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2010-09-22 11:41:44 UTC (rev 25083)
@@ -6,11 +6,12 @@
import org.jboss.tools.jst.jsp.test.ca.Jbide1791Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1585Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1641Test;
+import org.jboss.tools.jst.jsp.test.ca.SelectionBarTest;
public class JstJspAllTests {
public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.jboss.tools.jst.jsp.test");
+ TestSuite suite = new TestSuite("Test for org.jboss.tools.jst.jsp.test"); //$NON-NLS-1$
/*
* TODO: Uncomment the following test case after https://jira.jboss.org/browse/JBIDE-7104 issue
@@ -30,6 +31,8 @@
*/
suite.addTestSuite(JspPreferencesPageTest.class);
+
+ suite.addTestSuite(SelectionBarTest.class);
return suite;
}
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/SelectionBarTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/SelectionBarTest.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/SelectionBarTest.java 2010-09-22 11:41:44 UTC (rev 25083)
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 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.jst.jsp.test.ca;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.State;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.WorkbenchUtils;
+
+/**
+ * Junit which tests selection bar command behaviour and logic
+ * @author mareshkau
+ *
+ */
+public class SelectionBarTest extends TestCase{
+ protected IProject project = null;
+ private TestProjectProvider provider = null;
+ private Command toggleSelBarCommand;
+ private State toggleSelBarState;
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, "JsfJbide1791Test",false); //$NON-NLS-1$ //$NON-NLS-2$
+ project = provider.getProject();
+ ICommandService commandService =
+ (ICommandService) PlatformUI.getWorkbench()
+ .getService(ICommandService.class);
+ toggleSelBarCommand = commandService.getCommand(
+ "org.jboss.tools.jst.jsp.commands.showSelectionBar"); //$NON-NLS-1$
+ toggleSelBarState= toggleSelBarCommand
+ .getState("org.eclipse.ui.commands.toggleState"); //$NON-NLS-1$
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testSelectionBarCommandState() throws Throwable{
+ assertEquals("check command enabled command status",false,toggleSelBarCommand.isEnabled()); //$NON-NLS-1$
+ IEditorPart editorPart = WorkbenchUtils.openEditor(project.getName()+"/WebContent/pages/selectionBar.xhtml"); //$NON-NLS-1$
+ if(editorPart instanceof JSPMultiPageEditor){
+ JSPMultiPageEditor multiPageEditor = (JSPMultiPageEditor) editorPart;
+ multiPageEditor.pageChange(0);
+ assertEquals("check command enabled command status",true,toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue()); //$NON-NLS-1$
+ multiPageEditor.pageChange(multiPageEditor.getPreviewIndex());
+ assertEquals("check command enabled command status",false,toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue()); //$NON-NLS-1$
+ multiPageEditor.pageChange(0);
+ assertEquals("check command enabled command status",true,toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue()); //$NON-NLS-1$
+ IWorkbenchPage page = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage();
+ IWorkbenchPart part = page.getViewReferences()[0].getPart(false);
+ page.activate(part);
+ // close
+ page.closeAllEditors(false);
+ assertEquals("check command enabled command status",false,toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue()); //$NON-NLS-1$
+ } else{
+ fail("Should be opened JSPMultiPage Editor"); //$NON-NLS-1$
+ }
+ }
+}
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/SelectionBarTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 7 months