JBoss Tools SVN: r10763 - trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-10-09 06:27:52 -0400 (Thu, 09 Oct 2008)
New Revision: 10763
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java
Log:
JBIDE-2876: implement the feature
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2008-10-09 07:36:13 UTC (rev 10762)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2008-10-09 10:27:52 UTC (rev 10763)
@@ -1,8 +1,19 @@
package org.jboss.tools.esb.project.ui.wizards;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
@@ -10,6 +21,8 @@
import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.esb.core.ESBProjectConstant;
+import org.jboss.tools.esb.core.ESBProjectCorePlugin;
+import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
import org.jboss.tools.esb.project.ui.messages.JBossESBUIMessages;
import org.jboss.tools.esb.project.ui.wizards.pages.ESBProjectFirstPage;
@@ -47,6 +60,26 @@
protected IFacetedProjectTemplate getTemplate() {
return ProjectFacetsManager.getTemplate(ESBProjectConstant.ESB_PROJECT_FACET_TEMPLATE);
}
+
+ @Override
+ protected void postPerformFinish() throws InvocationTargetException {
+ super.postPerformFinish();
+ String prjName = this.getProjectName();
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(prjName);
+ if(!project.exists()) return;
+
+ try {
+ String esbcontent = project.getPersistentProperty(IJBossESBFacetDataModelProperties.QNAME_ESB_CONTENT_FOLDER);
+ IPath esbPath = new Path(esbcontent).append(ESBProjectConstant.META_INF);
+ IFile esbFile = project.getFolder(esbPath).getFile(ESBProjectConstant.ESB_CONFIG_JBOSSESB);
+ IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IDE.openEditor(page, esbFile);
+
+ } catch (CoreException e) {
+ ESBProjectCorePlugin.getDefault().getLog().log(e.getStatus());
+ }
+
+ }
17 years, 6 months
JBoss Tools SVN: r10762 - in workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools: b2j/wizard and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-10-09 03:36:13 -0400 (Thu, 09 Oct 2008)
New Revision: 10762
Modified:
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java
Log:
JBIDE-2842: fix some ui bugs
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java 2008-10-09 06:41:40 UTC (rev 10761)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java 2008-10-09 07:36:13 UTC (rev 10762)
@@ -96,7 +96,7 @@
try {
TranslateHelper.createFiles(fileLocation, bpmnFileName,
strForProcessDefs, jpdlFileNames,
- B2JMessages.Jpdl_Process_Definition_Name);
+ B2JMessages.Jpdl_Process_Definition_Name, false);
} catch (Exception e) {
errors.add(B2JMessages.Translate_Error_JpdlFile_CanNotWrite
+ e.getMessage());
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java 2008-10-09 06:41:40 UTC (rev 10761)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java 2008-10-09 07:36:13 UTC (rev 10762)
@@ -84,7 +84,7 @@
try {
TranslateHelper.createFiles(fileLocation, bpmnFileName,
strForGpdDefs, gpdFileNames,
- B2JMessages.Gpd_Definition_Name);
+ B2JMessages.Gpd_Definition_Name, false);
} catch (Exception e) {
errors.add(B2JMessages.Translate_Error_GpdFile_CanNotWrite
+ e.getMessage());
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java 2008-10-09 06:41:40 UTC (rev 10761)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java 2008-10-09 07:36:13 UTC (rev 10762)
@@ -59,21 +59,21 @@
* create translated files from dom strings
*/
public static File[] createFiles(String parentFolder, String bpmnFileName,
- String[] strsForGenerate, String[] fileFolders, String fileName)
- throws IOException {
+ String[] strsForGenerate, String[] fileFolders, String fileName,
+ boolean isOverWrite) throws IOException {
File jpdlFolder = BPMNToUtil.createFile(parentFolder,
- B2JMessages.Jpdl_Suffix, null);
- File diagramFolder = BPMNToUtil.createFile(jpdlFolder.getAbsolutePath(),
- bpmnFileName, null);
+ B2JMessages.Jpdl_Suffix, null, isOverWrite);
+ File diagramFolder = BPMNToUtil.createFile(
+ jpdlFolder.getAbsolutePath(), bpmnFileName, null, isOverWrite);
File[] files = new File[strsForGenerate.length];
File processFolder = null;
int i = 0;
for (String str : strsForGenerate) {
- processFolder = BPMNToUtil.createFile(diagramFolder.getAbsolutePath(),
- fileFolders[i], null);
+ processFolder = BPMNToUtil.createFile(diagramFolder
+ .getAbsolutePath(), fileFolders[i], null, isOverWrite);
files[i] = BPMNToUtil.createFile(processFolder.getAbsolutePath(),
- fileName, str);
+ fileName, str, isOverWrite);
i++;
}
return files;
@@ -126,7 +126,7 @@
return isOk;
}
-
+
/*
* select the elements from process. These elements have no transitions sub
* element or have transtions to end-state.
@@ -135,18 +135,22 @@
List<Element> list = new ArrayList<Element>();
if (processRoot.element(B2JMessages.Jpdl_End_Element_Name) != null) {
- Element endState = processRoot.element(B2JMessages.Jpdl_End_Element_Name);
+ Element endState = processRoot
+ .element(B2JMessages.Jpdl_End_Element_Name);
for (Object ele : processRoot.elements()) {
- Element subEle = ((Element) ele).element(B2JMessages.Jpdl_Transition_Element);
+ Element subEle = ((Element) ele)
+ .element(B2JMessages.Jpdl_Transition_Element);
if (subEle != null
- && endState.attributeValue(B2JMessages.Dom_Element_Name).equals(
- subEle.attributeValue(B2JMessages.To))) {
+ && endState
+ .attributeValue(B2JMessages.Dom_Element_Name)
+ .equals(subEle.attributeValue(B2JMessages.To))) {
list.add((Element) ele);
}
}
} else {
for (Object ele : processRoot.elements()) {
- if (((Element) ele).element(B2JMessages.Jpdl_Transition_Element) == null) {
+ if (((Element) ele)
+ .element(B2JMessages.Jpdl_Transition_Element) == null) {
list.add((Element) ele);
}
}
@@ -201,7 +205,8 @@
String width, String height) {
Element ele = DomXmlWriter.addElement(parentEle, name);
DomXmlWriter.addAttribute(ele, B2JMessages.Width_Attribute_Name, width);
- DomXmlWriter.addAttribute(ele, B2JMessages.Height_Attribute_Name, height);
+ DomXmlWriter.addAttribute(ele, B2JMessages.Height_Attribute_Name,
+ height);
return ele;
}
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java 2008-10-09 06:41:40 UTC (rev 10761)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/wizard/B2JExportWizard.java 2008-10-09 07:36:13 UTC (rev 10762)
@@ -36,7 +36,7 @@
private List<String> strForGpdList = new ArrayList<String>();
private List<String> generatedFoldersList = new ArrayList<String>();
- public void createGeneratedFile() {
+ public void createGeneratedFile(boolean isOverWrite) {
String[] jpdlFolderNames = new String[this.generatedFoldersList.size()];
int i = 0;
@@ -58,7 +58,7 @@
try {
TranslateHelper.createFiles(location, bpmnFileName, strs,
jpdlFolderNames,
- B2JMessages.Jpdl_Process_Definition_Name);
+ B2JMessages.Jpdl_Process_Definition_Name, isOverWrite);
} catch (Exception e) {
BpmnToPlugin.getDefault().logError(e.getMessage());
}
@@ -73,7 +73,7 @@
}
try {
TranslateHelper.createFiles(location, bpmnFileName, strs,
- jpdlFolderNames, B2JMessages.Gpd_Definition_Name);
+ jpdlFolderNames, B2JMessages.Gpd_Definition_Name, isOverWrite);
} catch (Exception e) {
BpmnToPlugin.getDefault().logError(e.getMessage());
}
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java 2008-10-09 06:41:40 UTC (rev 10761)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java 2008-10-09 07:36:13 UTC (rev 10762)
@@ -50,14 +50,14 @@
* create a file
*/
public static File createFile(String parentFolder, String fileName,
- String inputStr) throws IOException {
+ String inputStr, boolean isOverWrite) throws IOException {
File child = new File(parentFolder, fileName);
if (inputStr == null) {
- if (!child.exists()) {
+ if (!child.exists() || isOverWrite) {
child.mkdir();
}
} else {
- if (!child.exists()) {
+ if (!child.exists() || isOverWrite) {
child.createNewFile();
}
FileWriter childWriter = new FileWriter(child);
@@ -143,8 +143,7 @@
/*
* get bpmn pool id list from a dom document
*/
- public static Map<String, String> getPoolIDsFromDocument(
- Document document) {
+ public static Map<String, String> getPoolIDsFromDocument(Document document) {
Map<String, String> poolIDMap = new HashMap<String, String>();
Element diagram = document.getRootElement();
for (Object pool : diagram.elements(B2JMessages.Bpmn_Pool_Element_Name)) {
@@ -157,28 +156,28 @@
}
return poolIDMap;
}
-
-
+
public static Composite createComposite(Composite parent, int numColumns) {
Composite composite = new Composite(parent, SWT.NULL);
-
+
GridLayout layout = new GridLayout();
layout.numColumns = numColumns;
composite.setLayout(layout);
composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
return composite;
}
-
+
@SuppressWarnings("unchecked")
public static boolean checkSelectedResources(ISelection selectedResources) {
boolean res = true;
if (selectedResources instanceof IStructuredSelection
- && !selectedResources.isEmpty()) {
- IStructuredSelection ss = (IStructuredSelection)selectedResources;
- for (Iterator it = ss.iterator(); it.hasNext(); ){
+ && !selectedResources.isEmpty()) {
+ IStructuredSelection ss = (IStructuredSelection) selectedResources;
+ for (Iterator it = ss.iterator(); it.hasNext();) {
Object o = it.next();
if (o instanceof IFile) {
- if (!((IFile)o).getFileExtension().equalsIgnoreCase("bpmn")) {
+ if (!((IFile) o).getFileExtension()
+ .equalsIgnoreCase("bpmn")) {
res = false;
break;
}
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java 2008-10-09 06:41:40 UTC (rev 10761)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java 2008-10-09 07:36:13 UTC (rev 10762)
@@ -111,6 +111,7 @@
try {
idMap = BPMNToUtil.getPoolIDsFromDocument(getDocument(
bpmnFileParentPath, bpmnFileName));
+ poolIdList.clear();
} catch (Exception e) {
errorList.add(0, NLS.bind(
B2JMessages.Translate_Error_File_CanNotRead,
@@ -139,7 +140,8 @@
}
public boolean performFinish() {
- createGeneratedFile();
+
+ createGeneratedFile(locationPage.isOverWrite());
refreshWorkspace();
return true;
}
@@ -154,7 +156,7 @@
/*
* write the generated strings to the files
*/
- public abstract void createGeneratedFile();
+ public abstract void createGeneratedFile(boolean b);
/*
* get the path of the eclipse workspace container
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java 2008-10-09 06:41:40 UTC (rev 10761)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java 2008-10-09 07:36:13 UTC (rev 10762)
@@ -26,6 +26,8 @@
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -46,7 +48,9 @@
private ISelection currentSelection;
private Button button;
private IWizard wizard;
+ private boolean isOverWrite;
+
protected GeneratedFileLocationPage(String pageName, String title,
String description) {
super(pageName);
@@ -98,6 +102,12 @@
button
.setText(B2JMessages.Bpmn_GeneratedFile_Location_WizardPage_CheckBox);
button.setFont(parent.getFont());
+ button.addSelectionListener(new SelectionListener(){
+ public void widgetDefaultSelected(SelectionEvent arg0) {
+ }
+ public void widgetSelected(SelectionEvent arg0) {
+ isOverWrite = button.getSelection();
+ }});
return button;
}
@@ -150,7 +160,16 @@
public void setSelection(ISelection currentSelection) {
this.currentSelection = currentSelection;
}
+
+ public boolean isOverWrite() {
+ return isOverWrite;
+ }
+
+ public void setOverWrite(boolean isOverWrite) {
+ this.isOverWrite = isOverWrite;
+ }
+
}
class ProFilter extends ViewerFilter {
17 years, 6 months
JBoss Tools SVN: r10761 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2008-10-09 02:41:40 -0400 (Thu, 09 Oct 2008)
New Revision: 10761
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java
Log:
JBIDE-2871
Fixed by Slava Kabanovich, while in Minsk
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java 2008-10-09 05:55:47 UTC (rev 10760)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/ExtendedFieldEditor.java 2008-10-09 06:41:40 UTC (rev 10761)
@@ -209,7 +209,7 @@
public void setErrorProvider(IAttributeErrorProvider errorProvider) {
this.errorProvider = errorProvider;
- if(this instanceof PropertyChangeListener) {
+ if(this instanceof PropertyChangeListener && errorProvider != null) {
errorProvider.addErrorStateListener((PropertyChangeListener)this);
}
}
17 years, 6 months
JBoss Tools SVN: r10760 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-10-09 01:55:47 -0400 (Thu, 09 Oct 2008)
New Revision: 10760
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
Log:
JBIDE-2838
disable the collapse button of the graphical section
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-10-09 05:53:15 UTC (rev 10759)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-10-09 05:55:47 UTC (rev 10760)
@@ -258,8 +258,7 @@
Composite rootMainControl = form.getBody();
form.setText("Data Mapping Page");
Section section = this.createPageSectionHeader(rootMainControl,
- Section.TITLE_BAR | Section.DESCRIPTION | Section.TWISTIE
- | Section.EXPANDED, "Mapping Graph Edit Panel",
+ Section.TITLE_BAR | Section.DESCRIPTION , "Mapping Graph Edit Panel",
"Edit the source and target assosiation");
Composite mappingMainComposite = toolkit.createComposite(section);
GridLayout gly = new GridLayout();
17 years, 6 months
JBoss Tools SVN: r10759 - in trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml: ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-10-09 01:53:15 -0400 (Thu, 09 Oct 2008)
New Revision: 10759
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java
Log:
JBIDE-2841
1.Remove the load button
2.Change the file browse button location
3.Add title and description for the wizard page
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-10-09 04:58:44 UTC (rev 10758)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-10-09 05:53:15 UTC (rev 10759)
@@ -58,6 +58,11 @@
}
public Object getReturnValue() {
+ try {
+ returnObject = this.loadedTheObject(fileText.getText());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
return returnObject;
}
@@ -106,7 +111,6 @@
// registe the listener for controls
hookBrowseButtonSelectionAdapter();
hookFileTextModifyListener();
- hookRadioButtonSelectionAdapter();
this.setControl(mainComposite);
}
@@ -176,6 +180,43 @@
xsdLayout.marginWidth = 0;
xsdComposite.setLayout(xsdLayout);
+ Label nfileLanel = new Label(xsdComposite, SWT.NONE);
+ nfileLanel.setText("XML File Path :");
+ fileTextComposite = new Composite(xsdComposite, SWT.NONE);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.grabExcessHorizontalSpace = true;
+ fileTextComposite.setLayoutData(gd);
+ GridLayout xsdtgl = new GridLayout();
+ xsdtgl.marginWidth = 0;
+ xsdtgl.marginHeight = 0;
+ xsdtgl.numColumns = 1;
+ fileTextComposite.setLayout(xsdtgl);
+
+ fileText = new Text(fileTextComposite, SWT.BORDER);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ fileText.setLayoutData(gd);
+ gd.grabExcessHorizontalSpace = true;
+
+// final Button loadXSDButton = new Button(fileTextComposite, SWT.NONE);
+// loadXSDButton.setText("Load");
+// loadXSDButton.addSelectionListener(new SelectionAdapter() {
+//
+// @Override
+// public void widgetSelected(SelectionEvent e) {
+// super.widgetSelected(e);
+// reasourceLoaded = false;
+// try {
+// returnObject = loadedTheObject(fileText.getText());
+// reasourceLoaded = true;
+// } catch (Throwable e2) {
+// // ignore
+// e2.printStackTrace();
+// }
+// changeWizardPageStatus();
+// }
+//
+// });
+
Composite browseButtonComposite = new Composite(xsdComposite, SWT.NONE);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
@@ -202,75 +243,29 @@
gd.horizontalAlignment = GridData.END;
fileSystemBrowseButton.setLayoutData(gd);
- Label nfileLanel = new Label(xsdComposite, SWT.NONE);
- nfileLanel.setText("XSD File Path :");
- fileTextComposite = new Composite(xsdComposite, SWT.NONE);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.grabExcessHorizontalSpace = true;
- fileTextComposite.setLayoutData(gd);
- GridLayout xsdtgl = new GridLayout();
- xsdtgl.marginWidth = 0;
- xsdtgl.marginHeight = 0;
- xsdtgl.numColumns = 2;
- fileTextComposite.setLayout(xsdtgl);
-
- fileText = new Text(fileTextComposite, SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- fileText.setLayoutData(gd);
- gd.grabExcessHorizontalSpace = true;
-
- final Button loadXSDButton = new Button(fileTextComposite, SWT.NONE);
- loadXSDButton.setText("Load");
- loadXSDButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- super.widgetSelected(e);
- reasourceLoaded = false;
- try {
- returnObject = loadedTheObject(fileText.getText());
- reasourceLoaded = true;
- } catch (Throwable e2) {
- // ignore
- e2.printStackTrace();
- }
- changeWizardPageStatus();
- }
-
- });
-
- // tableViewer = CheckboxTableViewer.newCheckList(xsdComposite,
- // SWT.FULL_SELECTION | SWT.BORDER);
- // gd = new GridData(GridData.FILL_BOTH);
- // gd.heightHint = 200;
- // gd.horizontalSpan = 2;
- // tableViewer.getControl().setLayoutData(gd);
- //
- // initTableViewer();
-
return xsdComposite;
}
abstract protected Object loadedTheObject(String path) throws Exception;
protected void initTableViewer() {
- tableViewer.addCheckStateListener(new ICheckStateListener() {
- boolean flag = true;
-
- public void checkStateChanged(CheckStateChangedEvent event) {
- if (flag) {
- Object checkObject = event.getElement();
- boolean check = event.getChecked();
- flag = false;
- tableViewer.setAllChecked(false);
- tableViewer.setChecked(checkObject, check);
- flag = true;
- changeWizardPageStatus();
- }
- }
- });
- tableViewer.setContentProvider(new XSDStructuredModelContentProvider());
- tableViewer.setLabelProvider(new XSDStructuredModelLabelProvider());
+// tableViewer.addCheckStateListener(new ICheckStateListener() {
+// boolean flag = true;
+//
+// public void checkStateChanged(CheckStateChangedEvent event) {
+// if (flag) {
+// Object checkObject = event.getElement();
+// boolean check = event.getChecked();
+// flag = false;
+// tableViewer.setAllChecked(false);
+// tableViewer.setChecked(checkObject, check);
+// flag = true;
+// changeWizardPageStatus();
+// }
+// }
+// });
+// tableViewer.setContentProvider(new XSDStructuredModelContentProvider());
+// tableViewer.setLabelProvider(new XSDStructuredModelLabelProvider());
}
protected void setCompositeChildrenEnabled(Composite composite,
@@ -305,9 +300,9 @@
String error = null;
if (text == null || "".equals(text))
error = "Please Select a file";
- if (!reasourceLoaded) {
- error = "Resource must be loaded";
- }
+// if (!reasourceLoaded) {
+// error = "Resource must be loaded";
+// }
this.setErrorMessage(error);
this.setPageComplete(error == null);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java 2008-10-09 04:58:44 UTC (rev 10758)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java 2008-10-09 05:53:15 UTC (rev 10759)
@@ -17,14 +17,20 @@
public XMLStructuredDataWizardPage(String pageName, String title,
ImageDescriptor titleImage) {
super(pageName, title, titleImage);
- // TODO Auto-generated constructor stub
+ setPageText();
}
public XMLStructuredDataWizardPage(String pageName) {
super(pageName);
- // TODO Auto-generated constructor stub
+ setPageText();
}
+ private void setPageText() {
+ this.setTitle("Select xml file");
+ this.setDescription("Select a .xml file to be the source/target data");
+
+ }
+
/*
* (non-Javadoc)
*
17 years, 6 months
JBoss Tools SVN: r10758 - in trunk/smooks/plugins: org.jboss.tools.smooks.xml and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-10-09 00:58:44 -0400 (Thu, 09 Oct 2008)
New Revision: 10758
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml2xml/
trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.xml/plugin.xml
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java
Log:
JBIDE-2840
The smooks editor can't generate/parse XSL/Freemarker file contents currently , so if user want to use the graphical to generate the contents , there will open a dialog to tell them it's nonsupport
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2008-10-09 00:49:08 UTC (rev 10757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2008-10-09 04:58:44 UTC (rev 10758)
@@ -16,6 +16,8 @@
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Shell;
import org.jboss.tools.smooks.analyzer.AbstractAnalyzer;
import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
@@ -52,6 +54,13 @@
public void analyzeMappingGraphModel(
SmooksConfigurationFileGenerateContext context)
throws SmooksAnalyzerException {
+ // TODO will modify soon
+
+ if(true){
+ Shell shell = context.getShell();
+ MessageDialog.openWarning(shell, "Warning", "The java2xml can't be generate to config file currently.");
+ }
+
GraphRootModel rootModel = context.getDataMappingRootModel();
List<SourceModel> sourceModelList = rootModel.loadSourceModelList();
List<TargetModel> targetModelList = rootModel.loadTargetModelList();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml/plugin.xml
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml/plugin.xml 2008-10-09 00:49:08 UTC (rev 10757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml/plugin.xml 2008-10-09 04:58:44 UTC (rev 10758)
@@ -11,6 +11,18 @@
name="XML Data Type"
typeID="org.jboss.tools.smooks.xml.viewerInitor.xml">
</viewerInitor>
+ </extension>
+ <extension
+ point="org.jboss.tools.smooks.ui.analyzer">
+ <mappingAnalyzer
+ class="org.jboss.tools.smooks.xml2xml.XML2XMLAnalyzer"
+ name="XML2XML Analyzer"
+ typeID="org.jboss.tools.smooks.xml.viewerInitor.xml">
+ <targetSourceType
+ id="org.jboss.tools.smooks.xml.viewerInitor.xml"
+ name="XML">
+ </targetSourceType>
+ </mappingAnalyzer>
</extension>
</plugin>
Added: trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java 2008-10-09 04:58:44 UTC (rev 10758)
@@ -0,0 +1,39 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.xml2xml;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.smooks.analyzer.AbstractAnalyzer;
+import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
+import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
+import org.jboss.tools.smooks.model.SmooksResourceListType;
+import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext;
+
+/**
+ * @author dart
+ *
+ */
+public class XML2XMLAnalyzer extends AbstractAnalyzer {
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingGraphModel(org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext)
+ */
+ public void analyzeMappingGraphModel(
+ SmooksConfigurationFileGenerateContext context)
+ throws SmooksAnalyzerException {
+ Shell shell = context.getShell();
+ MessageDialog.openWarning(shell, "Warning", "The xml2xml can't be generate to config file currently.");
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingSmooksModel(org.jboss.tools.smooks.model.SmooksResourceListType, java.lang.Object, java.lang.Object)
+ */
+ public MappingResourceConfigList analyzeMappingSmooksModel(
+ SmooksResourceListType listType, Object sourceObject,
+ Object targetObject) {
+ return null;
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-10-09 00:49:08 UTC (rev 10757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-10-09 04:58:44 UTC (rev 10758)
@@ -22,6 +22,7 @@
import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer;
import org.jboss.tools.smooks.graphical.GraphInformations;
import org.jboss.tools.smooks.graphical.Param;
+import org.jboss.tools.smooks.graphical.Params;
import org.jboss.tools.smooks.model.SmooksResourceListType;
import org.jboss.tools.smooks.xml.model.AbstractXMLObject;
import org.jboss.tools.smooks.xml.model.DocumentObject;
@@ -38,19 +39,24 @@
public Object buildSourceInputObjects(GraphInformations graphInfo,
SmooksResourceListType listType, IFile sourceFile)
throws InvocationTargetException {
- List<Param> paramList = graphInfo.getParams().getParam();
+ Params params = graphInfo.getParams();
String path = null;
- for (Iterator<Param> iterator = paramList.iterator(); iterator
- .hasNext();) {
- Param param = (Param) iterator.next();
- if (param.getName().equals(XML_FILE)) {
- path = param.getValue();
- break;
+ if (params != null) {
+ List<Param> paramList = graphInfo.getParams().getParam();
+ for (Iterator<Param> iterator = paramList.iterator(); iterator
+ .hasNext();) {
+ Param param = (Param) iterator.next();
+ if (param.getName().equals(XML_FILE)) {
+ path = param.getValue();
+ break;
+ }
}
}
if (path == null) {
- throw new InvocationTargetException(new Exception(
- "xml file path can't find in the graphInfo file"));
+ // TODO tell user the filepath can't find or not ?
+ return null;
+// throw new InvocationTargetException(new Exception(
+// "xml file path can't find in the graphInfo file"));
}
XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer();
try {
17 years, 6 months
JBoss Tools SVN: r10756 - in trunk/common: tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-08 18:39:11 -0400 (Wed, 08 Oct 2008)
New Revision: 10756
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java
trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java
Log:
fix junit tests errors
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java 2008-10-08 21:30:05 UTC (rev 10755)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java 2008-10-08 22:39:11 UTC (rev 10756)
@@ -46,7 +46,7 @@
if(of == null) return 1;
final IEditorPart p = openEditor(getObjectToOpen((XModelObject)object));
if(p != null && p.getSite().getSelectionProvider() != null && (object instanceof XModelObject)) {
- Display.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().syncExec(new Runnable() {
public void run() {
if(preferredPage != null && p instanceof EditorPartWrapper) {
EditorPartWrapper w = (EditorPartWrapper)p;
Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java 2008-10-08 21:30:05 UTC (rev 10755)
+++ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java 2008-10-08 22:39:11 UTC (rev 10756)
@@ -43,8 +43,13 @@
protected void setUp() {
project = ResourcesPlugin.getWorkspace().getRoot().getProject(
STYLE_OPENON_PROJECT);
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
JobUtils.waitForIdle();
}
+
+ protected void tearDown() {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
+ }
public OpenOnsTest() {
super("styleClass OpenOn tests");
17 years, 6 months
JBoss Tools SVN: r10755 - trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-08 17:30:05 -0400 (Wed, 08 Oct 2008)
New Revision: 10755
Modified:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java
Log:
fix junit test errors
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2008-10-08 20:01:45 UTC (rev 10754)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2008-10-08 21:30:05 UTC (rev 10755)
@@ -83,9 +83,10 @@
@Override
protected void tearDown() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
for (int i = 0; i < projectNames.length; i++) {
ResourcesUtils.deleteProject(projectNames[i]);
- EditorTestHelper.joinBackgroundActivities();
+ JobUtils.waitForIdle();
}
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
}
17 years, 6 months
JBoss Tools SVN: r10754 - in trunk/common/tests/org.jboss.tools.common.text.ext.test: projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-08 16:01:45 -0400 (Wed, 08 Oct 2008)
New Revision: 10754
Added:
trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test/FilterTest.java
trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/jspTagsHyperlinkTests.jsp
trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/tldUriHyperlinkTests.jsp
Modified:
trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.project
trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/web.xml
trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/classHyperlinkTests.jsp
trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java
Log:
add open-on tests common.ext.test
Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.project
===================================================================
--- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.project 2008-10-08 18:37:02 UTC (rev 10753)
+++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/.project 2008-10-08 20:01:45 UTC (rev 10754)
@@ -15,6 +15,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.common.verification.verifybuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
@@ -22,5 +27,6 @@
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
</natures>
</projectDescription>
Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test/FilterTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test/FilterTest.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test/FilterTest.java 2008-10-08 20:01:45 UTC (rev 10754)
@@ -0,0 +1,9 @@
+package org.jboss.tools.test;
+
+public class FilterTest {
+
+ public FilterTest() {
+ // TODO Auto-generated constructor stub
+ }
+
+}
Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/JavaSource/org/jboss/tools/test/FilterTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/web.xml 2008-10-08 18:37:02 UTC (rev 10753)
+++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/web.xml 2008-10-08 20:01:45 UTC (rev 10754)
@@ -6,6 +6,16 @@
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value>
</context-param>
+ <filter>
+ <description>JUnit Test Filter</description>
+ <display-name>JUnit Test Filter Display Name</display-name>
+ <filter-name>Filter1</filter-name>
+ <filter-class>org.jboss.tools.test.FilterTest</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>Filter1</filter-name>
+ <url-pattern>*</url-pattern>
+ </filter-mapping>
<listener>
<listener-class>com.sun.faces.config.ConfigureListener</listener-class>
</listener>
@@ -20,7 +30,36 @@
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern>
</servlet-mapping>
+ <security-constraint>
+ <display-name>Accessible For Role1</display-name>
+ <web-resource-collection>
+ <web-resource-name>stylesheets</web-resource-name>
+ <url-pattern>/stylesheet*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Designer</role-name>
+ </auth-constraint>
+ </security-constraint>
+ <security-constraint>
+ <display-name>Accessible For Role1</display-name>
+ <web-resource-collection>
+ <web-resource-name>stylesheets</web-resource-name>
+ <url-pattern>*.jsp</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Developer</role-name>
+ </auth-constraint>
+ </security-constraint>
<login-config>
<auth-method>BASIC</auth-method>
</login-config>
+ <security-role>
+ <role-name>Administrator</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Designer</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Developer</role-name>
+ </security-role>
</web-app>
Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/classHyperlinkTests.jsp
===================================================================
--- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/classHyperlinkTests.jsp 2008-10-08 18:37:02 UTC (rev 10753)
+++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/classHyperlinkTests.jsp 2008-10-08 20:01:45 UTC (rev 10754)
@@ -29,7 +29,7 @@
<f:view>
<h1 class="style-class1">
<f:valueChangeListener type="org.jboss.tools.test.ChangeListenerInstance"/>
- </h1>
+ </h1>
</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/jspTagsHyperlinkTests.jsp
===================================================================
--- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/jspTagsHyperlinkTests.jsp (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/jspTagsHyperlinkTests.jsp 2008-10-08 20:01:45 UTC (rev 10754)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" version="2.0">
+ <jsp:directive.page language="java"
+ contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" />
+ <jsp:text>
+ <![CDATA[ <?xml version="1.0" encoding="ISO-8859-1" ?> ]]>
+ </jsp:text>
+ <jsp:text>
+ <![CDATA[ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
+ </jsp:text>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Insert title here</title>
+</head>
+<body>
+<f:view>
+
+</f:view>
+</body>
+</html>
+</jsp:root>
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/jspTagsHyperlinkTests.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/tldUriHyperlinkTests.jsp
===================================================================
--- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/tldUriHyperlinkTests.jsp (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/tldUriHyperlinkTests.jsp 2008-10-08 20:01:45 UTC (rev 10754)
@@ -0,0 +1,2 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/tldUriHyperlinkTests.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java 2008-10-08 18:37:02 UTC (rev 10753)
+++ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java 2008-10-08 20:01:45 UTC (rev 10754)
@@ -10,6 +10,7 @@
import org.eclipse.jface.text.FindReplaceDocumentAdapter;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.ui.IEditorDescriptor;
@@ -42,6 +43,7 @@
protected void setUp() {
project = ResourcesPlugin.getWorkspace().getRoot().getProject(
STYLE_OPENON_PROJECT);
+ JobUtils.waitForIdle();
}
public OpenOnsTest() {
@@ -50,6 +52,56 @@
public static final String WEB_XML_FILE_PATH = "WebContent/WEB-INF/web.xml";
+ public void testFilterNameOpenOn() throws PartInitException, BadLocationException {
+ IFile webXml = project.getFile(WEB_XML_FILE_PATH);
+ IEditorDescriptor descriptor = IDE.getEditorDescriptor(webXml);
+ IEditorPart editor = WorkbenchUtils.openEditor(webXml, descriptor.getId());
+ editor = ((EditorPartWrapper)editor).getEditor();
+ JobUtils.waitForIdle();
+ DefaultMultipageEditor xmlMultyPageEditor = (DefaultMultipageEditor) editor;
+ xmlMultyPageEditor.selectPageByName("Source");
+ ISourceViewer viewer = xmlMultyPageEditor.getSourceEditor().getTextViewer();
+
+ IDocument document = viewer.getDocument();
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ "Filter1", true, true, false, false);
+ reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset()+reg.getLength()+1,
+ "Filter1", true, true, false, false);
+ IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
+ assertNotNull(links);
+ assertTrue(links.length!=0);
+ assertNotNull(links[0].getHyperlinkText());
+ assertNotNull(links[0].toString());
+ links[0].open();
+ editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection();
+ assertEquals("<filter-name>", selection.getText());
+ }
+
+ public void testRoleNameOpenOn() throws PartInitException, BadLocationException {
+ IFile webXml = project.getFile(WEB_XML_FILE_PATH);
+ IEditorDescriptor descriptor = IDE.getEditorDescriptor(webXml);
+ IEditorPart editor = WorkbenchUtils.openEditor(webXml, descriptor.getId());
+ editor = ((EditorPartWrapper)editor).getEditor();
+ JobUtils.waitForIdle();
+ DefaultMultipageEditor xmlMultyPageEditor = (DefaultMultipageEditor) editor;
+ xmlMultyPageEditor.selectPageByName("Source");
+ ISourceViewer viewer = xmlMultyPageEditor.getSourceEditor().getTextViewer();
+
+ IDocument document = viewer.getDocument();
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ "Designer", true, true, false, false);
+ IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
+ assertNotNull(links);
+ assertTrue(links.length!=0);
+ assertNotNull(links[0].getHyperlinkText());
+ assertNotNull(links[0].toString());
+ links[0].open();
+ editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection();
+ assertEquals("<role-name>", selection.getText());
+ }
+
public void testServletNameOpenOn() throws PartInitException, BadLocationException {
IFile webXml = project.getFile(WEB_XML_FILE_PATH);
IEditorDescriptor descriptor = IDE.getEditorDescriptor(webXml);
@@ -70,30 +122,65 @@
reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset()+reg.getLength()+1,
"Faces Servlet", true, true, false, false);
IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
+ assertNotNull(links);
+ assertTrue(links.length!=0);
+ assertNotNull(links[0].getHyperlinkText());
+ assertNotNull(links[0].toString());
links[0].open();
editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- System.out.println(editor.getSite().getSelectionProvider().getSelection().toString());
+ ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection();
+ assertEquals("<servlet-name>", selection.getText());
}
+
+ public static final String TAGLIB_URI_TEST_FILE = "WebContent/tldUriHyperlinkTests.jsp";
- public void testTagAttributeOpenOn() throws BadLocationException {
+ public void testTaglibUriFromJarOpenOn() throws BadLocationException {
IEditorPart editor = WorkbenchUtils.openEditor(project
- .getFile(STYLE_TEST_FILE), JSPMultiPageEditor.EDITOR_ID);
+ .getFile(TAGLIB_URI_TEST_FILE), JSPMultiPageEditor.EDITOR_ID);
assertTrue(editor instanceof JSPMultiPageEditor);
JobUtils.waitForIdle();
JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument();
IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- "value", true, true, false, false);
+ "jsf/core", true, true, false, false);
IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
+ assertNotNull(links);
+ assertTrue(links.length!=0);
+ //assertNotNull(links[0].getHyperlinkText());
+ assertNotNull(links[0].toString());
links[0].open();
editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
String fileName = editor.getEditorInput().getName();
System.out.println(fileName);
- assertTrue("style1.css".equals(fileName));
+ assertTrue("jsf_core.tld".equals(fileName));
}
+ public static final String TAGLIB_URI_JSP_ROOT_TEST_FILE = "WebContent/jspTagsHyperlinkTests.jsp";
+ public void testTaglibUriFromJarinJspRootOpenOn() throws BadLocationException {
+ IEditorPart editor = WorkbenchUtils.openEditor(project
+ .getFile(TAGLIB_URI_JSP_ROOT_TEST_FILE), JSPMultiPageEditor.EDITOR_ID);
+ assertTrue(editor instanceof JSPMultiPageEditor);
+ JobUtils.waitForIdle();
+ JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
+ ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+ IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument();
+ IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ "jsf/core", true, true, false, false);
+ IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
+ assertNotNull(links);
+ assertTrue(links.length!=0);
+ //assertNotNull(links[0].getHyperlinkText());
+ assertNotNull(links[0].toString());
+ links[0].open();
+ editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+
+ String fileName = editor.getEditorInput().getName();
+ System.out.println(fileName);
+ assertTrue("jsf_core.tld".equals(fileName));
+ }
+
public static final String STYLE_TEST_FILE = "WebContent/styleHyperlinkTests.jsp";
public static final String CSS1_TEST_FILE = "WebContent/stylesheet/style1.css";
public static final String CSS2_TEST_FILE = "WebContent/stylesheet/style2.css";
@@ -109,6 +196,10 @@
IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
"stylesheet/style1.css", true, true, false, false);
IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
+ assertNotNull(links);
+ assertTrue(links.length!=0);
+ //assertNotNull(links[0].getHyperlinkText());
+ assertNotNull(links[0].toString());
links[0].open();
editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
@@ -127,6 +218,10 @@
IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
"style-class9\"", true, true, false, false);
IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
+ assertNotNull(links);
+ assertTrue(links.length!=0);
+ //assertNotNull(links[0].getHyperlinkText());
+ assertNotNull(links[0].toString());
links[0].open();
editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
@@ -136,6 +231,10 @@
reg = new FindReplaceDocumentAdapter(document).find(0,
"style-class3", true, true, false, false);
links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
+ assertNotNull(links);
+ assertTrue(links.length!=0);
+ //assertNotNull(links[0].getHyperlinkText());
+ assertNotNull(links[0].toString());
links[0].open();
editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
@@ -146,16 +245,17 @@
"style-class6", true, true, false, false);
links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
links[0].open();
+ assertNotNull(links);
+ assertTrue(links.length!=0);
+ //assertNotNull(links[0].getHyperlinkText());
+ assertNotNull(links[0].toString());
+ links[0].open();
editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
fileName = editor.getEditorInput().getName();
assertTrue("style2.css".equals(fileName));
}
- public void testFilterNameOpenOn() {
-
- }
-
public static final String CLASS_TEST_FILE = "WebContent/classHyperlinkTests.jsp";
public static final String CLASS1_TEST_FILE = "JavaSource/org/jboss/test/ChangeListenerInstance.java";
@@ -166,24 +266,41 @@
JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
-// IEditorInput fileInput = new FileEditorInput(project
-// .getFile(CLASS_TEST_FILE));
-// IDocumentProvider documentProvider = DocumentProviderRegistry
-// .getDefault().getDocumentProvider(fileInput);
-//
-// documentProvider.connect(fileInput);
-// IDocument document = documentProvider.getDocument(fileInput);
IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
"org.jboss.tools.test.ChangeListenerInstance", true, true, false, false);
IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
-// ClassHyperlink classHyper = new ClassHyperlink();
-// classHyper.setOffset(reg.getOffset());
-// classHyper.setDocument(document);
-// classHyper.open();
+ assertNotNull(links);
+ assertTrue(links.length!=0);
+ //assertNotNull(links[0].getHyperlinkText());
+ assertNotNull(links[0].toString());
links[0].open();
editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
String fileName = editor.getEditorInput().getName();
assertTrue("ChangeListenerInstance.java".equals(fileName));
}
+
+ public void testTaglibTagNameOpenOn() throws CoreException, BadLocationException {
+ IEditorPart editor = WorkbenchUtils.openEditor(project
+ .getFile(CLASS_TEST_FILE), JSPMultiPageEditor.EDITOR_ID);
+ assertTrue(editor instanceof JSPMultiPageEditor);
+ JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor;
+ ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer();
+
+ IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0,
+ "view", true, true, false, false);
+ IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false);
+ assertNotNull(links);
+ assertTrue(links.length!=0);
+ //assertNotNull(links[0].getHyperlinkText());
+ assertNotNull(links[0].toString());
+ System.out.println(links[0].getClass().getName());
+ links[0].open();
+ editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+
+ String fileName = editor.getEditorInput().getName();
+ assertTrue("jsf_core.tld".equals(fileName));
+ }
+
+
}
17 years, 6 months