JBoss Tools SVN: r10247 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor/template and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-09-16 05:06:33 -0400 (Tue, 16 Sep 2008)
New Revision: 10247
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesTableProvider.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
Began fixed JBIDE-2521
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesTableProvider.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesTableProvider.java 2008-09-16 06:22:14 UTC (rev 10246)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/TemplatesTableProvider.java 2008-09-16 09:06:33 UTC (rev 10247)
@@ -18,8 +18,8 @@
import org.jboss.tools.vpe.editor.template.VpeAnyData;
public class TemplatesTableProvider implements XTableProvider, XTableImageProvider {
- static String[] COLUMNS = new String[]{"URI", "Tag Name", "Display", "Children"};
- static int[] WIDTH = new int[]{200, 150, 100, 100};
+ static String[] COLUMNS = new String[]{"URI","Tag for Display", "Tag Name", "Display", "Children"};
+ static int[] WIDTH = new int[]{200,150, 150, 100, 100};
List dataList;
public TemplatesTableProvider(List dataList){
@@ -27,7 +27,7 @@
}
public int getColumnCount() {
- return 4;
+ return 5;
}
public int getRowCount() {
@@ -45,10 +45,12 @@
case 0:
return data.getUri();
case 1:
+ return data.getTagForDisplay();
+ case 2:
return data.getName();
- case 2:
+ case 3:
return data.getDisplay();
- case 3:
+ case 4:
if(data.isChildren()) return "yes";
else return "no";
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-09-16 06:22:14 UTC (rev 10246)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-09-16 09:06:33 UTC (rev 10247)
@@ -277,6 +277,7 @@
public VpeAnyData getAnyData() {
return new VpeAnyData(
displayStr,
+ "",
valueStr,
borderStr,
valueColorStr,
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java 2008-09-16 06:22:14 UTC (rev 10246)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java 2008-09-16 09:06:33 UTC (rev 10247)
@@ -12,6 +12,7 @@
public class VpeAnyData extends VpeTemplateData {
private String uri;
+ private String tagForDisplay;
private String display;
private String value;
private String border;
@@ -26,6 +27,7 @@
}
public VpeAnyData(
String display,
+ String tagForDisplay,
String value,
String border,
String valueColor,
@@ -42,6 +44,7 @@
this.backgroundColor = backgroundColor;
this.borderColor = borderColor;
this.showIcon = showIcon;
+ this.tagForDisplay = tagForDisplay;
}
public String getUri() {
@@ -106,4 +109,10 @@
public void setValueColor(String valueColor) {
this.valueColor = valueColor;
}
+ public String getTagForDisplay() {
+ return tagForDisplay;
+ }
+ public void setTagForDisplay(String tagForDisplay) {
+ this.tagForDisplay = tagForDisplay;
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2008-09-16 06:22:14 UTC (rev 10246)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2008-09-16 09:06:33 UTC (rev 10247)
@@ -10,6 +10,10 @@
******************************************************************************/
package org.jboss.tools.vpe.editor.template;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -35,6 +39,7 @@
private CheckControl ctlChildren;
private CheckControl ctlModify;
private Combo cbDisplay;
+ private Combo cbTagForDisplay;
private int displayIndexMem;
private Text txtValue;
private Text txtBorder;
@@ -45,12 +50,23 @@
private CheckControl ctlShowIcon;
private static String[] displayItems = new String[3];
+
+ private static List<String> displayTags = new ArrayList<String>();
static {
displayItems[0] = VpeAnyCreator.VAL_DISPLAY_BLOCK;
displayItems[1] = VpeAnyCreator.VAL_DISPLAY_INLINE;
displayItems[2] = VpeAnyCreator.VAL_DISPLAY_NONE;
}
+ static{
+ displayTags.add(VpeUIMessages.TAG_DIV);
+ displayTags.add(VpeUIMessages.TAG_SPAN);
+ displayTags.add(VpeUIMessages.TAG_B);
+ displayTags.add(VpeUIMessages.TAG_P);
+ displayTags.add(VpeUIMessages.TAG_TABLE);
+ }
+
+
public VpeEditAnyDialog(Shell shell, VpeAnyData data) {
super(shell);
@@ -76,15 +92,30 @@
composite.setBackground(parent.getBackground());
composite.setForeground(parent.getForeground());
composite.setFont(parent.getFont());
-
+
+ //added by estherbin https://jira.jboss.org/jira/browse/JBIDE-2521
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ Label tagFDisplayLabel = makeLabel(composite, VpeUIMessages.TAG_FOR_DISPLAY);
+
+ tagFDisplayLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
+ cbTagForDisplay = new Combo(composite,SWT.DROP_DOWN | SWT.READ_ONLY);
+ cbTagForDisplay.setLayoutData(gd);
+ cbTagForDisplay.setItems(displayTags.toArray(new String[displayTags.size()]));
+ cbTagForDisplay.select(0);
+
+
// ctlCaseSensitive = new CheckControl(composite, "Case sensitive", data.isCaseSensitive());
ctlChildren = new CheckControl(composite, VpeUIMessages.CHILDREN, data.isChildren());
// ctlModify = new CheckControl(composite, "Modify", data.isModify());
-
+
+
+
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
Label lblDisplay = makeLabel(composite, VpeUIMessages.DISPLAY);
lblDisplay.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
cbDisplay = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+
// gd.horizontalSpan = 2;
cbDisplay.setLayoutData(gd);
cbDisplay.setItems(displayItems);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2008-09-16 06:22:14 UTC (rev 10246)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2008-09-16 09:06:33 UTC (rev 10247)
@@ -98,5 +98,14 @@
public static String NON_VISUAL_TAGS;
public static String SHOW;
public static String HIDE;
+ public static String TAG_FOR_DISPLAY;
+
+ public static String TAG_B;
+ public static String TAG_TABLE;
+ public static String TAG_P;
+ public static String TAG_A;
+ public static String TAG_DIV;
+ public static String TAG_SPAN;
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2008-09-16 06:22:14 UTC (rev 10246)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2008-09-16 09:06:33 UTC (rev 10247)
@@ -58,4 +58,12 @@
VPE_VISUAL_REFRESH_JOB=Visual Editor Refresh
NON_VISUAL_TAGS=Non-visual tags
SHOW=Show
-HIDE=Hide
\ No newline at end of file
+HIDE=Hide
+TAG_FOR_DISPLAY=Tag for Display
+TAG_B=B
+TAG_TABLE=TABLE
+TAG_P=P
+TAG_A=A
+TAG_DIV=DIV
+TAG_SPAN=SPAN
+
16 years, 1 month
JBoss Tools SVN: r10246 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-09-16 02:22:14 -0400 (Tue, 16 Sep 2008)
New Revision: 10246
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSLibraryListFieldEditor.java
Log:
fix JBIDE-2633:Error text is misleading for WS runtime
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2008-09-15 22:13:28 UTC (rev 10245)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2008-09-16 06:22:14 UTC (rev 10246)
@@ -1,4 +1,4 @@
-Label_JBossWS_Runtime_Load_Error=Error occurred while loading JBossWS Command. Select the correct JBoss Server or JBoss EAP folder.
+Label_JBossWS_Runtime_Load_Error=Error occurred while loading JBossWS Command. Select the correct JBoss Server folder.
Command=wsconsume.sh
Bin=bin
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSLibraryListFieldEditor.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSLibraryListFieldEditor.java 2008-09-15 22:13:28 UTC (rev 10245)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JBossWSLibraryListFieldEditor.java 2008-09-16 06:22:14 UTC (rev 10246)
@@ -77,12 +77,9 @@
private Composite root = null;
private ActionPanel actionPanel;
-
+
private JBossWSRuntime tempJbws;
-
-
-
private Group jarGroup;
// ------------------------------------------------------------------------
@@ -103,17 +100,17 @@
JBossWSRuntime jbws) {
super(name, label, jbws);
this.tempJbws = new JBossWSRuntime();
- if(jbws != null){
+ if (jbws != null) {
this.tempJbws.setUserConfigClasspath(jbws.isUserConfigClasspath());
this.tempJbws.getLibraries().addAll(jbws.getLibraries());
}
-
+
}
-
- public Object getValue(){
+ public Object getValue() {
return this.tempJbws;
}
+
/**
* TBD
*
@@ -131,19 +128,19 @@
root.setLayoutData(gd);
root.setLayout(new GridLayout());
-
+
createCheckButton(root);
-
- jarGroup = new Group(root, SWT.BORDER);
+
+ jarGroup = new Group(root, SWT.NONE);
jarGroup.setText("Library Jars");
gd = new GridData(GridData.FILL_BOTH);
gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
-
-
+ gd.grabExcessHorizontalSpace = true;
+
+ jarGroup.setVisible(false);
jarGroup.setLayoutData(gd);
jarGroup.setLayout(new FormLayout());
-
+
createListView(jarGroup);
createActionBar(jarGroup);
@@ -159,31 +156,37 @@
actionsData.bottom = new FormAttachment(100, -5);
actionsData.right = new FormAttachment(100, -5);
actionPanel.setLayoutData(actionsData);
-
+
setJarGroupStatus();
return new Control[] { root };
}
- protected void createCheckButton(Composite parent){
+ protected void createCheckButton(Composite parent) {
final Button btnDefault = new Button(parent, SWT.CHECK);
- btnDefault.setText(JBossWSUIMessages.JBossWS_Runtime_Check_Field_Default_Classpath);
+ btnDefault
+ .setText(JBossWSUIMessages.JBossWS_Runtime_Check_Field_Default_Classpath);
GridData gd = new GridData();
gd.horizontalSpan = 2;
btnDefault.setLayoutData(gd);
-
+
btnDefault.setSelection(tempJbws.isUserConfigClasspath());
- btnDefault.addSelectionListener(new SelectionAdapter(){
+ btnDefault.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
+ if (jarGroup.isVisible()) {
+ jarGroup.setVisible(false);
+ } else {
+ jarGroup.setVisible(true);
+ }
+
tempJbws.setUserConfigClasspath(btnDefault.getSelection());
setJarGroupStatus();
setValue(null);
}
});
-
-
+
}
-
- protected void setJarGroupStatus(){
+
+ protected void setJarGroupStatus() {
boolean isUserConfig = tempJbws.isUserConfigClasspath();
jarGroup.setEnabled(isUserConfig);
listView.getTree().setEnabled(isUserConfig);
@@ -191,14 +194,16 @@
}
protected void createListView(Composite parent) {
- listView = new TreeViewer(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+ listView = new TreeViewer(parent, SWT.BORDER | SWT.H_SCROLL
+ | SWT.V_SCROLL);
listView.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
-
+
listView.setContentProvider(new ITreeContentProvider() {
public Object[] getElements(Object inputElement) {
if (inputElement instanceof JBossWSRuntime) {
- return ((JBossWSRuntime) inputElement).getLibraries().toArray();
+ return ((JBossWSRuntime) inputElement).getLibraries()
+ .toArray();
} else {
throw new IllegalArgumentException(
JBossWSUIMessages.JBossWS_Runtime_List_Field_Editor_Inputelement_Must_Be
@@ -233,6 +238,7 @@
listView.setLabelProvider(new ILabelProvider() {
Image jarImg;
+
public void addListener(ILabelProviderListener listener) {
}
@@ -247,33 +253,32 @@
}
public Image getImage(Object element) {
- if (jarImg == null){
- ImageDescriptor jarImgDesc = JBossWSUIPlugin.getImageDescriptor("obj16/jar_obj.gif");
+ if (jarImg == null) {
+ ImageDescriptor jarImgDesc = JBossWSUIPlugin
+ .getImageDescriptor("obj16/jar_obj.gif");
jarImg = jarImgDesc.createImage();
}
return jarImg;
}
public String getText(Object element) {
- String fullName = (String)element;
+ String fullName = (String) element;
File jarFile = new File(fullName);
- return jarFile.getName() + " - " + jarFile.getParentFile().toString();
+ return jarFile.getName() + " - "
+ + jarFile.getParentFile().toString();
}
});
-
listView.setInput(getValue());
-
+
}
protected void createActionBar(Composite parent) {
- actionPanel = new ActionPanel(parent, new BaseAction[] { new AddAction(),
- new RemoveAction() });
+ actionPanel = new ActionPanel(parent, new BaseAction[] {
+ new AddAction(), new RemoveAction() });
listView.addSelectionChangedListener(actionPanel);
}
-
-
/**
* Return array of Controls that forms and editor
*
@@ -318,8 +323,6 @@
((Control) getEditorControls()[0]).setLayoutData(gd);
}
-
-
/**
* Composite that holds list of BaseActions and presents them as column of
* buttons
@@ -475,7 +478,8 @@
public void setSelection(ISelection selection) {
if (selection instanceof IStructuredSelection) {
List<String> rts = new ArrayList<String>();
- for (Object jarfile : ((IStructuredSelection) selection).toArray()) {
+ for (Object jarfile : ((IStructuredSelection) selection)
+ .toArray()) {
rts.add((String) jarfile);
}
jars = rts.toArray(new String[] {});
@@ -541,7 +545,6 @@
}
}
}
-
/**
* Action deletes all selected JBossWS Runtimes. A warning message is shown
@@ -579,6 +582,5 @@
setValue(null);
}
-
}
}
\ No newline at end of file
16 years, 1 month
JBoss Tools SVN: r10245 - trunk/vpe/plugins/org.jboss.tools.vpe.docbook.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-15 18:13:28 -0400 (Mon, 15 Sep 2008)
New Revision: 10245
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/build.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-1304 add docbook plugin to the build
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/build.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/build.properties 2008-09-15 20:15:56 UTC (rev 10244)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/build.properties 2008-09-15 22:13:28 UTC (rev 10245)
@@ -1,5 +1,4 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
- .,\
- plugin.xml
+ plugin.xml,\
+ templates/
+jars.compile.order =
16 years, 1 month
JBoss Tools SVN: r10244 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.ui: src/main/org/jboss/ide/eclipse/archives/ui/actions and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-09-15 16:15:56 -0400 (Mon, 15 Sep 2008)
New Revision: 10244
Added:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildAction.java
Removed:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildProjectAction.java
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java
Log:
consolidating action code
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-09-15 16:54:33 UTC (rev 10243)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-09-15 20:15:56 UTC (rev 10244)
@@ -31,7 +31,7 @@
label="Archives"
visible="true">
<action
- class="org.jboss.ide.eclipse.archives.ui.actions.BuildProjectAction"
+ class="org.jboss.ide.eclipse.archives.ui.actions.BuildAction"
definitionId="org.jboss.ide.eclipse.packages.ui.actions.BuildArchivesAction"
icon="icons/build_packages.gif"
id="org.jboss.ide.eclipse.archives.ui.actions.BuildArchivesAction"
Copied: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildAction.java (from rev 10206, trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildProjectAction.java)
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildAction.java (rev 0)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildAction.java 2008-09-15 20:15:56 UTC (rev 10244)
@@ -0,0 +1,67 @@
+package org.jboss.ide.eclipse.archives.ui.actions;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
+import org.jboss.ide.eclipse.archives.core.model.IArchive;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
+
+public class BuildAction implements IWorkbenchWindowActionDelegate {
+ private IProject selectedProject;
+ public void dispose() {
+ }
+
+ public void init(IWorkbenchWindow window) {
+ }
+
+ public void run(IAction action) {
+ if( selectedProject != null )
+ buildSelectedNode(selectedProject);
+ }
+
+ public void run(Object node) {
+ buildSelectedNode(node);
+ }
+
+ public void selectionChanged(IAction action, ISelection selection) {
+ if( !selection.isEmpty() && selection instanceof IStructuredSelection ) {
+ Object o = ((IStructuredSelection)selection).getFirstElement();
+ if( o instanceof IAdaptable ) {
+ IResource res = (IResource) ((IAdaptable)o).getAdapter(IResource.class);
+ if( res != null ) {
+ selectedProject = res.getProject();
+ return;
+ }
+ }
+ }
+ selectedProject = null;
+ }
+
+ private void buildSelectedNode(final Object selected) {
+ new Job("Build Archive Node") {
+ protected IStatus run(IProgressMonitor monitor) {
+ if( selected == null ) return Status.OK_STATUS;
+ if (selected instanceof IArchiveNode &&
+ ((IArchiveNode)selected).getNodeType() == IArchiveNode.TYPE_ARCHIVE) {
+ new ArchiveBuildDelegate().fullArchiveBuild((IArchive)selected);
+ } else if( selected != null && selected instanceof IProject ){
+ new ArchiveBuildDelegate().fullProjectBuild(((IProject)selected).getProject().getLocation());
+ } else {
+ new ArchiveBuildDelegate().fullArchiveBuild(((IArchiveNode)selected).getRootArchive());
+ }
+ return Status.OK_STATUS;
+ }
+ }.schedule();
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildAction.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildProjectAction.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildProjectAction.java 2008-09-15 16:54:33 UTC (rev 10243)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/actions/BuildProjectAction.java 2008-09-15 20:15:56 UTC (rev 10244)
@@ -1,40 +0,0 @@
-package org.jboss.ide.eclipse.archives.ui.actions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
-
-public class BuildProjectAction implements IWorkbenchWindowActionDelegate {
- private IProject selectedProject;
- public void dispose() {
- }
-
- public void init(IWorkbenchWindow window) {
- }
-
- public void run(IAction action) {
- if( selectedProject != null )
- new ArchiveBuildDelegate().fullProjectBuild(selectedProject.getLocation());
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- if( !selection.isEmpty() && selection instanceof IStructuredSelection ) {
- Object o = ((IStructuredSelection)selection).getFirstElement();
- if( o instanceof IAdaptable ) {
- IResource res = (IResource) ((IAdaptable)o).getAdapter(IResource.class);
- if( res != null ) {
- selectedProject = res.getProject();
- return;
- }
- }
- }
- selectedProject = null;
- }
-
-}
\ No newline at end of file
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java 2008-09-15 16:54:33 UTC (rev 10243)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java 2008-09-15 20:15:56 UTC (rev 10244)
@@ -3,10 +3,6 @@
import java.util.Arrays;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.GroupMarker;
import org.eclipse.jface.action.IMenuManager;
@@ -25,7 +21,6 @@
import org.eclipse.ui.navigator.CommonActionProvider;
import org.eclipse.ui.navigator.ICommonActionExtensionSite;
import org.eclipse.ui.navigator.ICommonViewerSite;
-import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
import org.jboss.ide.eclipse.archives.core.build.SaveArchivesJob;
import org.jboss.ide.eclipse.archives.core.model.ArchiveNodeFactory;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
@@ -36,6 +31,7 @@
import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages;
import org.jboss.ide.eclipse.archives.ui.ExtensionManager;
import org.jboss.ide.eclipse.archives.ui.NodeContribution;
+import org.jboss.ide.eclipse.archives.ui.actions.BuildAction;
import org.jboss.ide.eclipse.archives.ui.actions.NewArchiveAction;
import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate.WrappedProject;
import org.jboss.ide.eclipse.archives.ui.views.ProjectArchivesCommonView;
@@ -144,7 +140,7 @@
buildAction = new Action("", ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_BUILD_PACKAGES)) {
public void run() {
- buildSelectedNode(getSelectedObject());
+ new BuildAction().run(getSelectedObject());
}
};
}
@@ -309,23 +305,6 @@
}
}
- private void buildSelectedNode(final Object selected) {
- new Job("Build Archive Node") {
- protected IStatus run(IProgressMonitor monitor) {
- if( selected == null ) return Status.OK_STATUS;
- if (selected instanceof IArchiveNode &&
- ((IArchiveNode)selected).getNodeType() == IArchiveNode.TYPE_ARCHIVE) {
- new ArchiveBuildDelegate().fullArchiveBuild((IArchive)selected);
- } else if( selected != null && selected instanceof IProject ){
- new ArchiveBuildDelegate().fullProjectBuild(((IProject)selected).getProject().getLocation());
- } else {
- new ArchiveBuildDelegate().fullArchiveBuild(((IArchiveNode)selected).getRootArchive());
- }
- return Status.OK_STATUS;
- }
- }.schedule();
- }
-
private void deleteSelectedNode () {
IArchiveNode node = getSelectedNode();
if (node != null) {
16 years, 1 month
JBoss Tools SVN: r10243 - in trunk: documentation/guides/Exadel-migration/en and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-09-15 12:54:33 -0400 (Mon, 15 Sep 2008)
New Revision: 10243
Modified:
trunk/as/docs/reference/en/master.xml
trunk/documentation/guides/Exadel-migration/en/master.xml
trunk/documentation/guides/GettingStartedGuide/en/master.xml
trunk/esb/docs/esb_ref_guide/en/master.xml
trunk/hibernatetools/docs/reference/en/master.xml
trunk/jbpm/docs/reference/en/master.xml
trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml
trunk/jsf/docs/jsf_tools_tutorial/en/master.xml
trunk/jsf/docs/userguide/en/master.xml
trunk/seam/docs/reference/en/master.xml
trunk/struts/docs/struts_tools_ref_guide/en/master.xml
trunk/struts/docs/struts_tools_tutorial/en/master.xml
trunk/ws/docs/reference/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-213
link to PDF version is added, font will be minimized
Modified: trunk/as/docs/reference/en/master.xml
===================================================================
--- trunk/as/docs/reference/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/as/docs/reference/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -43,6 +43,13 @@
<releaseinfo>
Version: 3.0.0.alpha
</releaseinfo>
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/as/pdf/AS_Reference_...">PDF version</ulink>
+ </para>
+</abstract>
+
</bookinfo>
Modified: trunk/documentation/guides/Exadel-migration/en/master.xml
===================================================================
--- trunk/documentation/guides/Exadel-migration/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/documentation/guides/Exadel-migration/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -35,6 +35,15 @@
<releaseinfo>
Version: 1.1.0.GA
</releaseinfo>
+
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/Exadel-migration/pdf...">PDF version</ulink>
+ </para>
+</abstract>
+
+
</bookinfo>
<toc/>
Modified: trunk/documentation/guides/GettingStartedGuide/en/master.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/documentation/guides/GettingStartedGuide/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -35,6 +35,14 @@
<holder>JBoss, a division of Red Hat Inc.</holder>
</copyright>
<releaseinfo>Version: 1.1.0.GA</releaseinfo>
+
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/GettingStartedGuide/...">PDF version</ulink>
+ </para>
+</abstract>
+
</bookinfo>
<toc/>
Modified: trunk/esb/docs/esb_ref_guide/en/master.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/esb/docs/esb_ref_guide/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -36,8 +36,15 @@
<releaseinfo>
Version: 3.0.0.alpha
</releaseinfo>
- </bookinfo>
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/esb_ref_guide/pdf/ES...">PDF version</ulink>
+ </para>
+</abstract>
+
+</bookinfo>
<toc/>
&introduction;
Modified: trunk/hibernatetools/docs/reference/en/master.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/hibernatetools/docs/reference/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -49,6 +49,14 @@
<imagedata fileref="images/hibernate_logo_a.png" format="PNG"/>
</imageobject>
</mediaobject>
+
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/hibernatetools/pdf/H...">PDF version</ulink>
+ </para>
+</abstract>
+
</bookinfo>
<toc/>
Modified: trunk/jbpm/docs/reference/en/master.xml
===================================================================
--- trunk/jbpm/docs/reference/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/jbpm/docs/reference/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -60,6 +60,14 @@
<holder>JBoss, a division of Red Hat Inc.</holder>
</copyright>
<releaseinfo> Version: 3.0.0.alpha </releaseinfo>
+
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/jbpm/pdf/JBPM_Refere...">PDF version</ulink>
+ </para>
+</abstract>
+
</bookinfo>
<toc/>
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -43,6 +43,14 @@
<releaseinfo>
Version: 3.0.0.alpha
</releaseinfo>
+
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/jsf_tools_ref_guide/...">PDF version</ulink>
+ </para>
+</abstract>
+
</bookinfo>
<toc/>
Modified: trunk/jsf/docs/jsf_tools_tutorial/en/master.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/jsf/docs/jsf_tools_tutorial/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -44,6 +44,16 @@
<releaseinfo>
Version: 3.0.0.alpha
</releaseinfo>
+
+
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/struts_tools_tutoria...">PDF version</ulink>
+ </para>
+</abstract>
+
+
</bookinfo>
<toc/>
Modified: trunk/jsf/docs/userguide/en/master.xml
===================================================================
--- trunk/jsf/docs/userguide/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/jsf/docs/userguide/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -36,8 +36,15 @@
<releaseinfo>
Version: 1.1.0.GA
</releaseinfo>
- </bookinfo>
-
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/jsf/pdf/Visual_Web_T...">PDF version</ulink>
+ </para>
+</abstract>
+
+
+ </bookinfo>
<toc/>
&Visual_Web_Tools;
Modified: trunk/seam/docs/reference/en/master.xml
===================================================================
--- trunk/seam/docs/reference/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/seam/docs/reference/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -49,9 +49,15 @@
Version: 3.0.0.alpha
</releaseinfo>
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/seam/pdf/Seam_Refere...">PDF version</ulink>
+ </para>
+</abstract>
+
+
</bookinfo>
-
-
<toc/>
&intro;
Modified: trunk/struts/docs/struts_tools_ref_guide/en/master.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/struts/docs/struts_tools_ref_guide/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -44,8 +44,17 @@
<releaseinfo>
Version: 3.0.0.alpha
</releaseinfo>
+
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/struts_tools_ref_gui...">PDF version</ulink>
+ </para>
+</abstract>
+
+
</bookinfo>
-
+
<toc/>
&introduction;
Modified: trunk/struts/docs/struts_tools_tutorial/en/master.xml
===================================================================
--- trunk/struts/docs/struts_tools_tutorial/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/struts/docs/struts_tools_tutorial/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -43,6 +43,14 @@
<releaseinfo>
Version: 3.0.0.alpha
</releaseinfo>
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/struts_tools_tutoria...">PDF version</ulink>
+ </para>
+</abstract>
+
+
</bookinfo>
<toc/>
Modified: trunk/ws/docs/reference/en/master.xml
===================================================================
--- trunk/ws/docs/reference/en/master.xml 2008-09-15 16:46:46 UTC (rev 10242)
+++ trunk/ws/docs/reference/en/master.xml 2008-09-15 16:54:33 UTC (rev 10243)
@@ -23,8 +23,15 @@
<releaseinfo>
Version: 3.0.GA
</releaseinfo>
+<abstract>
+ <title/>
+ <para>
+ <ulink url="http://download.jboss.org/jbosstools/nightly-docs/en/ws_ref_guide/pdf/WS_...">PDF version</ulink>
+ </para>
+</abstract>
+
+
</bookinfo>
-
<toc/>
&overview;
16 years, 1 month
JBoss Tools SVN: r10242 - trunk/jsf/features/org.jboss.tools.richfaces.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-15 12:46:46 -0400 (Mon, 15 Sep 2008)
New Revision: 10242
Modified:
trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-1304 add docbook plugin to the build
Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-09-15 15:58:04 UTC (rev 10241)
+++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-09-15 16:46:46 UTC (rev 10242)
@@ -494,4 +494,10 @@
fragment="true"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.vpe.docbook"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
16 years, 1 month
JBoss Tools SVN: r10241 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-09-15 11:58:04 -0400 (Mon, 15 Sep 2008)
New Revision: 10241
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2498 CA shows proposals which begisn with #{ for EL which begins with ${ elements
Issue is fixed (JSF case was omitted in the previous fix)
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-09-15 15:21:08 UTC (rev 10240)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-09-15 15:58:04 UTC (rev 10241)
@@ -198,6 +198,9 @@
WTPKbJsfValuesResource r4 = new WTPKbJsfValuesResource(input, h.getConnector());
proposals.addAll(r4.queryProposal(matchString));
+ int elStart = getELStartPosition(matchString);
+ int elEnd = getELEndPosition(matchString, currentValue);
+
for (Iterator iter = proposals.iterator(); iter.hasNext();) {
KbProposal kbProposal = cleanFaceletProposal((KbProposal)iter.next());
kbProposal.postProcess(currentValue, offset);
@@ -208,13 +211,29 @@
if(kbProposal.getStart() >= 0) {
String replacementString = kbProposal.getReplacementString();
+ String label = kbProposal.getLabel();
+ int cursorPositionDelta = 0;
+ if (elStart > -1) {
+ replacementString = replacementString.substring(2);
+ if (matchString.charAt(elStart) != label.charAt(0)) {
+ label = matchString.charAt(elStart) + label.substring(1);
+ }
+ } else if (matchString.endsWith("#") || matchString.endsWith("$")) {
+ replacementString = replacementString.substring(1);
+ cursorPositionDelta += 1;
+ if (matchString.charAt(matchString.length() - 1) != label.charAt(0)) {
+ label = matchString.charAt(matchString.length() - 1) + label.substring(1);
+ }
+ }
+ if (elStart> -1 && elEnd > -1) {
+ replacementString = replacementString.substring(0, replacementString.length() - 1);
+ }
int replacementBeginPosition = start + kbProposal.getStart();
int replacementLength = kbProposal.getEnd() - kbProposal.getStart();
- int cursorPositionDelta = 0;
int cursorPosition = kbProposal.getPosition() + cursorPositionDelta;
AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(kbProposal.autoActivationContentAssistantAfterApplication(), replacementString,
replacementBeginPosition, replacementLength, cursorPosition, SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE),
- kbProposal.getLabel(), null, kbProposal.getContextInfo(), relevance);
+ label, null, kbProposal.getContextInfo(), relevance);
contentAssistRequest.addProposal(proposal);
continue;
} else {
@@ -223,10 +242,27 @@
int replacementLength = 0;
int cursorPositionDelta = 0;
String replacementString = replacementStringBuffer.toString();
+ String label = kbProposal.getLabel();
+ if (elStart > -1) {
+ replacementString = replacementString.substring(2);
+ if (matchString.charAt(elStart) != label.charAt(0)) {
+ label = matchString.charAt(elStart) + label.substring(1);
+ }
+ } else if (matchString.endsWith("#") || matchString.endsWith("$")) {
+ replacementString = replacementString.substring(1);
+ cursorPositionDelta += 1;
+ if (matchString.charAt(matchString.length() - 1) != label.charAt(0)) {
+ label = matchString.charAt(matchString.length() - 1) + label.substring(1);
+ }
+ }
+ if (elStart> -1 && elEnd > -1) {
+ replacementString = replacementString.substring(0, replacementString.length() - 1);
+ }
+
int cursorPosition = kbProposal.getPosition() + cursorPositionDelta;
AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(kbProposal.autoActivationContentAssistantAfterApplication(), replacementString,
replacementBeginPosition, replacementLength, cursorPosition, SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE),
- kbProposal.getLabel(), null, kbProposal.getContextInfo(), relevance);
+ label, null, kbProposal.getContextInfo(), relevance);
contentAssistRequest.addProposal(proposal);
}
}
@@ -238,6 +274,114 @@
return false;
}
+ /*
+ * Checks if the EL operand starting characters are present
+ * @return
+ */
+ private int getELStartPosition(String matchString) {
+ if (matchString == null || matchString.length() == 0)
+ return -1;
+
+ int offset = matchString.length();
+
+ while (--offset >= 0) {
+ if ('}' == matchString.charAt(offset))
+ return -1;
+
+ if ('"' == matchString.charAt(offset) || '\'' == matchString.charAt(offset)) {
+ int backslashCount = 0;
+ while ((offset - 1 - backslashCount) >= 0 && matchString.charAt(offset - 1 - backslashCount) == '\\') {
+ backslashCount++;
+ }
+
+ if (backslashCount % 2 == 0)
+ return -1;
+ }
+
+ if ('{' == matchString.charAt(offset) &&
+ (offset - 1) >= 0 &&
+ ('#' == matchString.charAt(offset - 1) ||
+ '$' == matchString.charAt(offset - 1))) {
+ return (offset - 1);
+ }
+ }
+ return -1;
+ }
+
+ /*
+ * Checks if the EL operand ending character is present
+ * @return
+ */
+ private int getELEndPosition(String matchString, String currentValue) {
+ if (matchString == null || matchString.length() == 0 ||
+ currentValue == null || currentValue.length() == 0 ||
+ currentValue.length() < matchString.length())
+ return -1;
+
+ String restOfCurrentValue = currentValue.substring(matchString.length());
+ int offset = -1;
+
+ char inQuotesChar = 0;
+ while (++offset < restOfCurrentValue.length()) {
+ if (inQuotesChar == 0) {
+ if ('}' == restOfCurrentValue.charAt(offset))
+ return matchString.length() + offset;
+
+ if ('#' == restOfCurrentValue.charAt(offset))
+ return -1;
+
+ if ('"' == restOfCurrentValue.charAt(offset) ||
+ '\'' == restOfCurrentValue.charAt(offset)) {
+ inQuotesChar = restOfCurrentValue.charAt(offset);
+ }
+
+ if ('\\' == restOfCurrentValue.charAt(offset)) {
+ int backslashCount = 1;
+
+ while ((offset + backslashCount) < restOfCurrentValue.length() &&
+ restOfCurrentValue.charAt(offset + backslashCount) == '\\') {
+ backslashCount++;
+ }
+
+ if (offset + backslashCount >= restOfCurrentValue.length())
+ return -1;
+
+ if (backslashCount % 2 == 1 &&
+ ('"' == restOfCurrentValue.charAt(offset + backslashCount) ||
+ '\'' == restOfCurrentValue.charAt(offset + backslashCount))) {
+ inQuotesChar = restOfCurrentValue.charAt(offset + backslashCount);
+ offset += backslashCount;
+ }
+ }
+ } else {
+ if ('"' == restOfCurrentValue.charAt(offset) ||
+ '\'' == restOfCurrentValue.charAt(offset)) {
+ inQuotesChar = 0;
+ }
+
+ if ('\\' == restOfCurrentValue.charAt(offset)) {
+ int backslashCount = 1;
+
+ while ((offset + backslashCount) < restOfCurrentValue.length() &&
+ restOfCurrentValue.charAt(offset + backslashCount) == '\\') {
+ backslashCount++;
+ }
+
+ if (offset + backslashCount >= restOfCurrentValue.length())
+ return -1;
+
+ if (backslashCount % 2 == 1 &&
+ ('"' == restOfCurrentValue.charAt(offset + backslashCount) ||
+ '\'' == restOfCurrentValue.charAt(offset + backslashCount))) {
+ inQuotesChar = 0;
+ offset += backslashCount;
+ }
+ }
+ }
+ }
+ return -1;
+ }
+
protected void addAttributeNameProposals(ContentAssistRequest contentAssistRequest) {
Element element = (Element)contentAssistRequest.getNode();
NamedNodeMap attributes = element.getAttributes();
16 years, 1 month
JBoss Tools SVN: r10240 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-15 11:21:08 -0400 (Mon, 15 Sep 2008)
New Revision: 10240
Removed:
trunk/docbook/
Log:
remove component because it is duplicated in VPE
16 years, 1 month
JBoss Tools SVN: r10239 - trunk/seam/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-09-15 11:02:50 -0400 (Mon, 15 Sep 2008)
New Revision: 10239
Modified:
trunk/seam/docs/reference/en/modules/seam_preferences.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-389 - adding a tip about renaming;
Modified: trunk/seam/docs/reference/en/modules/seam_preferences.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/seam_preferences.xml 2008-09-15 15:00:42 UTC (rev 10238)
+++ trunk/seam/docs/reference/en/modules/seam_preferences.xml 2008-09-15 15:02:50 UTC (rev 10239)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="seam_preferences" xreflabel="seam_preferences"> <!-- mark as new -->
+<chapter id="seam_preferences" xreflabel="seam_preferences">
+ <!-- mark as new -->
<?dbhtml filename="seam_preferences.html"?>
<chapterinfo>
<keywordset>
@@ -11,121 +12,150 @@
<title>Seam Preferences</title>
-<para>In this chapter you get to know how Seam preferences can be modified during the development process.</para>
+ <para>In this chapter you get to know how Seam preferences can be modified during the
+ development process.</para>
- <section id="gen_pref">
+ <section id="gen_pref">
<title>General Preferences</title>
- <para>Seam preferences can be set using the Seam preference page. Click on <emphasis><property>Window > Preferences > JBoss Tools > Web > Seam</property>.</emphasis></para>
-
- <para>On this page you can manage the Seam Runtime. Use the appropriate buttons to <property>Add</property> more runtimes or to <property>Remove</property> those that are not needed.</para>
-
- <figure>
- <title>Seam Preferences Page</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/seam_preferences/seam_preferences1.png"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>Clicking on <property>Edit</property> button you get the form where you can change the path of Seam runtime home folder,
- modify name and version. Press <property>Finish</property> to apply the changes.</para>
-
- <figure>
- <title>Edit Seam Runtime</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/seam_preferences/seam_preferences1_2.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+ <para>Seam preferences can be set using the Seam preference page. Click on
+ <emphasis><property>Window > Preferences > JBoss Tools > Web >
+ Seam</property>.</emphasis></para>
-<section id="validator_pref">
+ <para>On this page you can manage the Seam Runtime. Use the appropriate buttons to
+ <property>Add</property> more runtimes or to <property>Remove</property> those that
+ are not needed.</para>
-<title>Validator Preferences</title>
-
- <para>Seam preference page includes a subsection <property>Validator</property>.
- See <emphasis><property>Window > Preferences > JBoss Tools > Web > Seam > Validator</property>.</emphasis></para>
- <para>On this page you can choose a severity level for the various Seam validator problems. For example, if you want to ignore the case when component
- name is duplicated expand the <property>Components</property> node and select <property>Ignore</property> next to <property>Duplicate component name</property>.
- After that you won't see the error.</para>
+ <figure>
+ <title>Seam Preferences Page</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/seam_preferences/seam_preferences1.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Clicking on <property>Edit</property> button you get the form where you can change the
+ path of Seam runtime home folder, modify name and version. Press
+ <property>Finish</property> to apply the changes.</para>
- <figure>
- <title>Seam Validator Preference Page</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/seam_preferences/seam_preferences1_3.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+ <figure>
+ <title>Edit Seam Runtime</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/seam_preferences/seam_preferences1_2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
- <para>In the upper right corner of the page there is a <property>Configure Project Specific</property> link. Clicking on it you get the form where you can
- choose a project for specific setting. Project specific configuration allows you to have different validator settings for each project. Check the
- <property>Show only projects with project specific settings</property> if you want to see the projects that have been already set. Click on <property>Ok</property>.</para>
+ <section id="validator_pref">
- <figure>
- <title>Project Specific Configuration</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/seam_preferences/seam_preferences1_4.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+ <title>Validator Preferences</title>
- <para>You get the validator properties page for chosen project. Check the <property>Enable project specific settings</property> to be able to change the settings.</para>
+ <para>Seam preference page includes a subsection <property>Validator</property>. See
+ <emphasis><property>Window > Preferences > JBoss Tools > Web > Seam >
+ Validator</property>.</emphasis></para>
+ <para>On this page you can choose a severity level for the various Seam validator
+ problems. For example, if you want to ignore the case when component name is
+ duplicated expand the <property>Components</property> node and select
+ <property>Ignore</property> next to <property>Duplicate component
+ name</property>. After that you won't see the error.</para>
-<note>
- <title>Note:</title>
- <para>You can open the same page by right clicking on the needed project in Package Explorer, then <emphasis><property>Properties > Seam Validator</property>.</emphasis></para>
-</note>
- <figure>
- <title>Validator Properties Page for Chosen Project</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/seam_preferences/seam_preferences1_5.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+ <figure>
+ <title>Seam Validator Preference Page</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/seam_preferences/seam_preferences1_3.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>In the upper right corner of the page there is a <property>Configure Project
+ Specific</property> link. Clicking on it you get the form where you can choose a
+ project for specific setting. Project specific configuration allows you to have
+ different validator settings for each project. Check the <property>Show only
+ projects with project specific settings</property> if you want to see the
+ projects that have been already set. Click on <property>Ok</property>.</para>
-</section>
- </section>
+ <figure>
+ <title>Project Specific Configuration</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/seam_preferences/seam_preferences1_4.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>You get the validator properties page for chosen project. Check the
+ <property>Enable project specific settings</property> to be able to change the
+ settings.</para>
+
+ <note>
+ <title>Note:</title>
+ <para>You can open the same page by right clicking on the needed project in Package
+ Explorer, then <emphasis><property>Properties > Seam
+ Validator</property>.</emphasis></para>
+ </note>
+
+ <figure>
+ <title>Validator Properties Page for Chosen Project</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/seam_preferences/seam_preferences1_5.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+
+ </section>
+ </section>
+
<section id="project_pref">
<title>Project Preferences</title>
-
- <para>Once Seam project is created you can modify its settings. Right click on Seam project in Project Explorer and select <emphasis><property>Properties > Seam Settings</property>.</emphasis></para>
- <para>This project properties page allows you to have a flexible project layout. It means that you are not restricted with a specific project structure. You can use the Seam wizards
- (New Action, Form, Entity, etc.) on Maven, command line seam-gen or your own project structure. </para>
- <para>Moreover you are not required to use the Seam New Project wizard to benefit from Seam artifact wizards. You can just enable Seam on your existing project and configure the folders as you want.</para>
-
- <!-- <para>After <property>Seam support</property> is checked</para> -->
-
- <figure>
+
+ <para>Once Seam project is created you can modify its settings. Right click on Seam project
+ in Project Explorer and select <emphasis><property>Properties > Seam
+ Settings</property>.</emphasis></para>
+ <para>This project properties page allows you to have a flexible project layout. It means
+ that you are not restricted with a specific project structure. You can use the Seam
+ wizards (New Action, Form, Entity, etc.) on Maven, command line seam-gen or your own
+ project structure. </para>
+ <para>Moreover you are not required to use the Seam New Project wizard to benefit from Seam
+ artifact wizards. You can just enable Seam on your existing project and configure the
+ folders as you want.</para>
+
+ <figure>
<title>Properties for Seam Project</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
<imagedata fileref="images/seam_preferences/seam_preferences2.png"/>
</imageobject>
</mediaobject>
</figure>
-
- <para>In Seam Wizards (New Action, Form, Entity, Conversation, Generate Entities) you can get a quick access to project settings
- using the <property>Settings</property> link in the upper right corner of each wizard.</para>
-
+
+ <tip>
+ <title>Tip:</title>
+ <para>The wizard doesn't allow the renaming of the artifacts listed in the Seam Settings.
+ It's possible to do in the <property>Package Explorer</property>. See <link
+ linkend="renaming_projects_folders">Renaming the Projects and
+ Folders</link>.</para>
+ </tip>
+
+ <para>In Seam Wizards (New Action, Form, Entity, Conversation, Generate Entities) you can
+ get a quick access to project settings using the <property>Settings</property> link in
+ the upper right corner of each wizard.</para>
+
<figure>
<title>Settings Link</title>
- <mediaobject>
+ <mediaobject>
<imageobject>
<imagedata fileref="images/seam_preferences/seam_preferences2_1.png"/>
</imageobject>
</mediaobject>
</figure>
-
-
+
+
</section>
</chapter>
16 years, 1 month
JBoss Tools SVN: r10238 - trunk/seam/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-09-15 11:00:42 -0400 (Mon, 15 Sep 2008)
New Revision: 10238
Modified:
trunk/seam/docs/reference/en/modules/directory_structure.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-389 - adding the section about renaming the projects and folders;
Modified: trunk/seam/docs/reference/en/modules/directory_structure.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/directory_structure.xml 2008-09-15 11:57:46 UTC (rev 10237)
+++ trunk/seam/docs/reference/en/modules/directory_structure.xml 2008-09-15 15:00:42 UTC (rev 10238)
@@ -83,5 +83,33 @@
and <property>war</property> modules of the EAR project.</para>
</section>
+ <section id="renaming_projects_folders">
+ <title>Renaming the Projects and Folders</title>
+ <para>If you need to rename one of the Seam Project artifacts
+ (<emphasis><project_name></emphasis>,
+ <emphasis><project_name>-test</emphasis>,
+ <emphasis><project_name>-test</emphasis> or
+ <emphasis><project_name>-ejb</emphasis>) or any entire folder like
+ <emphasis><project_name>/WebContent</emphasis>,
+ <emphasis><project_name>/ejbModule</emphasis>,
+ <emphasis><project_name>-test/test-src</emphasis>, or project name in
+ packages <emphasis>org.domain.<project_name>.session</emphasis>,
+ <emphasis>org.domain.<project_name>.entity</emphasis>, you can do this
+ by brining the context menu and navigating <emphasis>
+ <property>Refactor > Rename...</property>
+ </emphasis> or just pressing <emphasis>
+ <property>Shift + Alt + R</property>
+ </emphasis> under the chosen resource.</para>
+
+ <para>Use <emphasis>
+ <property>Refactor > Move...</property>
+ </emphasis> (or <emphasis>
+ <property>Shift + Alt + V</property>
+ </emphasis>), if you need to move
+ <emphasis><project_name>/WebContent</emphasis> folder,
+ <emphasis><project_name>/ejbModule</emphasis> folder or
+ <emphasis><project_name>/test-src</emphasis> folder in the other place
+ within the Project structure.</para>
+ </section>
</chapter>
16 years, 1 month