JBoss Tools SVN: r6847 - trunk/jsf/docs/userguide/en/images.
by jbosstools-commits＠lists.jboss.org
Author: ykryvinchanka
Date: 2008-03-11 11:24:01 -0400 (Tue, 11 Mar 2008)
New Revision: 6847
Removed:
trunk/jsf/docs/userguide/en/images/AddCustomCapab/
Log:
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6846 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-11 10:58:33 -0400 (Tue, 11 Mar 2008)
New Revision: 6846
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java
Log:
JBIDE-1322
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-03-11 14:35:12 UTC (rev 6845)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-03-11 14:58:33 UTC (rev 6846)
@@ -183,7 +183,7 @@
ISeamFacetDataModelProperties.SEAM_EJB_PROJECT,
SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_EJB_PROJECT,
getEjbProjectName(),
- true);
+ true, false);
registerEditor(ejbProjectEditor, deploymentGroup);
Group viewGroup = createGroup(
@@ -263,7 +263,7 @@
registerEditor(createTestCheckBox, testGroup);
- IFieldEditor testProjectEditor = SeamWizardFactory.createSeamProjectSelectionFieldEditor(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_TEST_PROJECT, getTestProjectName(),false);
+ IFieldEditor testProjectEditor = SeamWizardFactory.createSeamProjectSelectionFieldEditor(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_TEST_PROJECT, getTestProjectName(),false, false);
registerEditor(testProjectEditor, testGroup);
sourceFolder = getTestSourceFolder();
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2008-03-11 14:35:12 UTC (rev 6845)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2008-03-11 14:58:33 UTC (rev 6846)
@@ -49,14 +49,15 @@
*
*/
public class SeamWizardFactory {
-
+
/**
* @param defaultSelection
* @param allowAllProjects If "false" show only projects with seam nature.
* @return
*/
- public static IFieldEditor createSeamProjectSelectionFieldEditor(String name, String label, String defaultSelection, boolean allowAllProjects) {
- if(allowAllProjects) {
+ public static IFieldEditor createSeamProjectSelectionFieldEditor(String name, String label, String defaultSelection,
+ boolean allowAllProjects, boolean editSettings) {
+ if(!editSettings) {
return IFieldEditorFactory.INSTANCE.createButtonFieldEditor(
name, label, defaultSelection,
new SelectSeamProjectAction(allowAllProjects), ValidatorFactory.NO_ERRORS_VALIDATOR);
@@ -80,7 +81,7 @@
*/
public static IFieldEditor createSeamProjectSelectionFieldEditor(
String defaultSelection) {
- return createSeamProjectSelectionFieldEditor(IParameter.SEAM_PROJECT_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_SEAM_PROJECT, defaultSelection, false);
+ return createSeamProjectSelectionFieldEditor(IParameter.SEAM_PROJECT_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_SEAM_PROJECT, defaultSelection, false, true);
}
/**
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6845 - trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-03-11 10:35:12 -0400 (Tue, 11 Mar 2008)
New Revision: 6845
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF
Log:
remove cyclic dependency between jsf.ext.test and seam.ext.test
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF 2008-03-11 14:31:07 UTC (rev 6844)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF 2008-03-11 14:35:12 UTC (rev 6845)
@@ -15,8 +15,7 @@
org.jboss.tools.common.text.ext,
org.eclipse.wst.sse.core,
org.jboss.tools.common.model,
- org.jboss.tools.common.test,
- org.jboss.tools.seam.text.ext
+ org.jboss.tools.common.test
Eclipse-LazyStart: true
Bundle-Vendor: Red Hat, Inc.
Export-Package: org.jboss.tools.jsf.text.ext.tests
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6844 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-03-11 10:31:07 -0400 (Tue, 11 Mar 2008)
New Revision: 6844
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
Removed:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1322
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-03-11 14:27:53 UTC (rev 6843)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-03-11 14:31:07 UTC (rev 6844)
@@ -410,7 +410,7 @@
<page
name="Seam Settings"
- class="org.jboss.tools.seam.ui.preferences.SeamSettingsPreferencePageNew"
+ class="org.jboss.tools.seam.ui.preferences.SeamSettingsPreferencePage"
id="org.jboss.tools.seam.ui.propertyPages.SeamSettingsPreferencePage">
<enabledWhen>
<adapt type="org.eclipse.core.resources.IProject">
Deleted: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-03-11 14:27:53 UTC (rev 6843)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-03-11 14:31:07 UTC (rev 6844)
@@ -1,453 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.seam.ui.preferences;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.seam.core.ISeamProject;
-import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.core.SeamPreferences;
-import org.jboss.tools.seam.core.project.facet.SeamRuntime;
-import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
-import org.jboss.tools.seam.core.project.facet.SeamVersion;
-import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.internal.project.facet.IValidator;
-import org.jboss.tools.seam.ui.widget.editor.ButtonFieldEditor;
-import org.jboss.tools.seam.ui.widget.editor.CompositeEditor;
-import org.jboss.tools.seam.ui.widget.editor.IFieldEditor;
-import org.jboss.tools.seam.ui.widget.editor.IFieldEditorFactory;
-import org.jboss.tools.seam.ui.widget.editor.ITaggedFieldEditor;
-import org.jboss.tools.seam.ui.widget.editor.LabelFieldEditor;
-import org.jboss.tools.seam.ui.widget.editor.SeamRuntimeListFieldEditor;
-import org.jboss.tools.seam.ui.widget.editor.ButtonFieldEditor.ButtonPressedAction;
-import org.jboss.tools.seam.ui.widget.editor.SeamRuntimeListFieldEditor.SeamRuntimeNewWizard;
-
-/**
- * @author Viacheslav Kabanovich
- */
-public class SeamSettingsPreferencePage extends PropertyPage {
- IProject project;
-
- IFieldEditor seamEnablement;
- IFieldEditor runtime;
- IFieldEditor installedRuntimes;
-
- ISeamProject seamProject;
-
- public SeamSettingsPreferencePage() {
- noDefaultAndApplyButton();
- }
-
- @Override
- public void setElement(IAdaptable element) {
- super.setElement(element);
- project = (IProject) getElement().getAdapter(IProject.class);
- }
-
- boolean hasSeamSupport() {
- return seamProject != null;
- }
-
- @Override
- protected Control createContents(Composite parent) {
- seamProject = SeamCorePlugin.getSeamProject(project, false);
-
- boolean cannotBeModified = false;
-
- if(seamProject != null) {
- cannotBeModified = seamProject.getParentProjectName() != null;
- }
- if(!cannotBeModified) {
- cannotBeModified = isEarPartInEarSeamProject(project);
- }
-
- seamEnablement = IFieldEditorFactory.INSTANCE.createCheckboxEditor(
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT, false);
- seamEnablement.setValue(hasSeamSupport());
-
- SeamRuntime rs = SeamRuntimeManager.getInstance().getRuntimeForProject(project);
-
- List<String> namesAsList = getNameList();
-
- runtime = IFieldEditorFactory.INSTANCE.createComboWithButton(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_RUNTIME,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_RUNTIME, namesAsList,
- rs==null?"":rs.getName(),true,new NewSeamRuntimeAction(),(IValidator)null); //$NON-NLS-1$
-
- ButtonPressedAction action = new ButtonPressedAction(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_INSTALLED_RUNTIMES) {
- public void run() {
- PreferenceDialog prefsdlg = PreferencesUtil.createPreferenceDialogOn(
- PlatformUI.getWorkbench().getDisplay().getActiveShell(),
- SeamPreferencePage.SEAM_PREFERENCES_ID,
- new String[] {SeamPreferencePage.SEAM_PREFERENCES_ID}, null
- );
-
- prefsdlg.open();
-
- String v = runtime.getValueAsString();
- List<String> list = getNameList();
- ((ITaggedFieldEditor) ((CompositeEditor) runtime)
- .getEditors().get(1)).setTags(list.toArray(new String[0]));
- if(v != null && list.contains(v)) {
- runtime.setValue(v);
- } else {
- setCurrentValue();
- }
- }
- };
-
- installedRuntimes = new ButtonFieldEditor(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_INSTALLED_RUNTIMES, action, null);
-
- List<IFieldEditor> editorOrder = new ArrayList<IFieldEditor>();
- editorOrder.add(seamEnablement);
- editorOrder.add(runtime);
-// editorOrder.add(installedRuntimes);
-
- setCurrentValue();
-
- seamEnablement.addPropertyChangeListener(new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- Object value = evt.getNewValue();
- if (value instanceof Boolean) {
- boolean v = ((Boolean) value).booleanValue();
- updateRuntimeEnablement(v);
- validate();
- }
- }
- });
-
- runtime.addPropertyChangeListener(new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- validate();
- }
- });
-
- Composite composite = new Composite(parent, SWT.NONE);
- int columnNumber = 1;
- for (IFieldEditor fieldEditor : editorOrder) {
- if (fieldEditor.getNumberOfControls() > columnNumber)
- columnNumber = fieldEditor.getNumberOfControls();
- }
- GridLayout gl = new GridLayout(columnNumber, false);
- gl.verticalSpacing = 5;
- gl.marginTop = 3;
- gl.marginLeft = 3;
- gl.marginRight = 3;
- composite.setLayout(gl);
- for (IFieldEditor fieldEditor2 : editorOrder) {
- fieldEditor2.doFillIntoGrid(composite);
- }
-
- LabelFieldEditor filler = new LabelFieldEditor("filler", "");
- Object[] fs = filler.getEditorControls(composite);
- if(fs != null && fs.length > 0 && fs[0] instanceof Label) {
- Label l = (Label)fs[0];
- GridData d = new GridData();
- d.horizontalSpan = columnNumber - 1;
- l.setLayoutData(d);
- }
-
- Object[] cs = installedRuntimes.getEditorControls(composite);
- if(cs != null && cs.length > 0 && cs[0] instanceof Button) {
- Button b = (Button)cs[0];
- GridData d = new GridData();
- d.horizontalAlignment = SWT.END;
- b.setLayoutData(d);
- }
-
- runtime.setEditable(false);
- if (!hasSeamSupport()) {
- updateRuntimeEnablement(false);
- }
-
- if(cannotBeModified) {
- setEnablement(seamEnablement, false);
- setEnablement(runtime, false);
- } else if(hasDependents(project)) {
- setEnablement(seamEnablement, false);
- }
- validate();
-
- return composite;
- }
-
- private List<String> getNameList() {
- Set<String> names = new TreeSet<String>();
- names.addAll(getAvailableRuntimeNames());
- if(hasSeamSupport()) {
- String currentName = seamProject.getRuntimeName();
- if(currentName != null) names.add(currentName);
- }
- List<String> namesAsList = new ArrayList<String>();
- namesAsList.addAll(names);
- return namesAsList;
- }
-
- private void setCurrentValue() {
- if (hasSeamSupport()) {
- String currentName = seamProject.getRuntimeName();
- if (currentName != null) {
- runtime.setValue(currentName);
- } else {
- runtime.setValue("");
- }
- } else if(isEarPartInEarSeamProject(project)) {
- runtime.setValue("");
- }
- }
-
- private boolean isEarPartInEarSeamProject(IProject p) {
- IProject[] ps = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i = 0; i < ps.length; i++) {
- IEclipsePreferences ep = new ProjectScope(ps[i]).getNode(SeamCorePlugin.PLUGIN_ID);
- if(ep == null) continue;
- String ear = ep.get("seam.ear.project", null);
- if(ear != null && ear.equals(p.getName())) return true;
- }
- return false;
- }
-
- private boolean hasDependents(IProject p) {
- ISeamProject sp = SeamCorePlugin.getSeamProject(p, false);
- if(sp == null) return false;
- IEclipsePreferences ep = SeamPreferences.getProjectPreferences(sp);
- if(ep == null) return false;
- String ear = ep.get("seam.ear.project", null);
- if(projectExists(ear)) return true;
- String ejb = ep.get("seam.ejb.project", null);
- if(projectExists(ejb)) return true;
- String test = ep.get("seam.test.project", null);
- if(projectExists(test)) return true;
- return false;
- }
-
- private boolean projectExists(String name) {
- if(name == null) return false;
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if(p != null && p.exists() && p.isAccessible()) return true;
- return false;
- }
-
- @Override
- public boolean performOk() {
- if (getSeamSupport()) {
- addSeamSupport();
- changeRuntime();
- } else {
- removeSeamSupport();
- }
- return true;
- }
-
- private void updateRuntimeEnablement(boolean enabled) {
- setEnablement(runtime, enabled);
- }
-
- void setEnablement(IFieldEditor editor, boolean enabled) {
- Object[] cs = editor.getEditorControls();
- for (int i = 0; i < cs.length; i++) {
- if (cs[i] instanceof Control) {
- ((Control) cs[i]).setEnabled(enabled);
- }
- }
- }
-
- private void removeSeamSupport() {
- try {
- EclipseResourceUtil.removeNatureFromProject(project,
- ISeamProject.NATURE_ID);
- } catch (CoreException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
- }
- }
-
- private void addSeamSupport() {
- try {
- EclipseResourceUtil.addNatureToProject(project,
- ISeamProject.NATURE_ID);
- } catch (CoreException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
- }
- }
-
- private void changeRuntime() {
- String name = getRuntimeName();
- SeamRuntime r = SeamRuntimeManager.getInstance()
- .findRuntimeByName(name);
- if (r == null)
- return;
- ISeamProject seamProject = SeamCorePlugin
- .getSeamProject(project, false);
- seamProject.setRuntimeName(name);
- }
-
- private boolean getSeamSupport() {
- Object o = seamEnablement.getValue();
- return o instanceof Boolean && ((Boolean) o).booleanValue();
- }
-
- private String getRuntimeName() {
- return runtime.getValueAsString();
- }
-
- private void validate() {
- if(getSeamSupport() && (runtime.getValue()== null || "".equals(runtime.getValue()))) { //$NON-NLS-1$
-// setValid(false);
- setMessage(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED, IMessageProvider.WARNING);
-// setErrorMessage(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED);
- } else {
- setValid(true);
- String value = runtime.getValueAsString();
- if(Boolean.TRUE.equals(seamEnablement.getValue()) && SeamRuntimeManager.getInstance().findRuntimeByName(value) == null) {
- setErrorMessage("Runtime " + value + " does not exist.");
- } else {
- setErrorMessage(null);
- setMessage(null, IMessageProvider.WARNING);
- }
- }
- }
-
- public class NewSeamRuntimeAction extends
- ButtonFieldEditor.ButtonPressedAction {
- /**
- * @param label
- */
- public NewSeamRuntimeAction() {
- super(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_ADD);
- }
-
- @Override
- public void run() {
- List<SeamRuntime> added = new ArrayList<SeamRuntime>();
- Wizard wiz = new SeamRuntimeNewWizard(
- new ArrayList<SeamRuntime>(Arrays
- .asList(SeamRuntimeManager.getInstance()
- .getRuntimes())), added);
- WizardDialog dialog = new WizardDialog(Display.getCurrent()
- .getActiveShell(), wiz);
- dialog.open();
-
- if (added.size() > 0) {
- SeamRuntimeManager.getInstance().addRuntime(added.get(0));
- getFieldEditor().setValue(added.get(0).getName());
- ((ITaggedFieldEditor) ((CompositeEditor) runtime)
- .getEditors().get(1)).setTags(getAvailableRuntimeNames()
- .toArray(new String[0]));
- runtime.setValue(added.get(0).getName());
- }
- }
- }
-
- private List<String> getAvailableRuntimeNames() {
- if(hasNature("org.eclipse.jdt.core.javanature")
- && !hasNature("org.eclipse.wst.common.project.facet.core.nature")) {
- return SeamRuntimeManager.getInstance().getAllRuntimeNames();
- }
- if(seamProject != null) {
- SeamRuntime r = seamProject.getRuntime();
- if(r != null) {
- SeamRuntime[] rs = SeamRuntimeManager.getInstance().getRuntimes(r.getVersion());
- return toNames(rs);
- }
- String jarLocation = getJBossSeamJarLocation();
- if(jarLocation != null) {
- String folder = new File(jarLocation).getParent();
- String vs = SeamRuntimeListFieldEditor.SeamRuntimeWizardPage.getSeamVersion(folder);
- SeamVersion v = findMatchingVersion(vs);
- if(v != null) {
- SeamRuntime[] rs = SeamRuntimeManager.getInstance().getRuntimes(v);
- return toNames(rs);
- }
- }
- }
- return SeamRuntimeManager.getInstance().getRuntimeNames();
- }
-
- private List<String> toNames(SeamRuntime[] rs) {
- List<String> list = new ArrayList<String>();
- if(rs != null) for (int i = 0; i < rs.length; i++) list.add(rs[i].getName());
- return list;
- }
-
- private boolean hasNature(String natureId) {
- try {
- return project != null && project.isAccessible() && project.hasNature(natureId);
- } catch (CoreException e) {
- return false;
- }
- }
-
- private String getJBossSeamJarLocation() {
- IJavaProject jp = EclipseResourceUtil.getJavaProject(project);
- if(jp == null) return null;
- IClasspathEntry[] es = null;
- try {
- es = jp.getResolvedClasspath(true);
- } catch (JavaModelException e) {
- //ignore
- return null;
- }
- if(es == null) return null;
- for (int i = 0; i < es.length; i++) {
- IPath p = es[i].getPath();
- if(p != null && p.lastSegment().equalsIgnoreCase("jboss-seam.jar")) {
- IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(p);
- if(f != null && f.exists()) return f.getLocation().toString();
- }
- }
- return null;
- }
-
- private SeamVersion findMatchingVersion(String vs) {
- if(vs == null) return null;
- if(vs.matches(SeamVersion.SEAM_1_2.toString().replace(".", "\\.") + ".*")) {
- return SeamVersion.SEAM_1_2;
- }
- if(vs.matches(SeamVersion.SEAM_2_0.toString().replace(".", "\\.") + ".*")) {
- return SeamVersion.SEAM_2_0;
- }
- return null;
- }
-
-}
Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-03-11 14:31:07 UTC (rev 6844)
@@ -0,0 +1,670 @@
+ /*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.preferences;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.datatools.connectivity.IConnectionProfile;
+import org.eclipse.datatools.connectivity.ProfileManager;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.ui.dialogs.PropertyPage;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamProjectsSet;
+import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences;
+import org.jboss.tools.seam.core.project.facet.SeamRuntime;
+import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
+import org.jboss.tools.seam.core.project.facet.SeamVersion;
+import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.ui.SeamGuiPlugin;
+import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory;
+import org.jboss.tools.seam.ui.widget.editor.IFieldEditor;
+import org.jboss.tools.seam.ui.widget.editor.IFieldEditorFactory;
+import org.jboss.tools.seam.ui.widget.editor.SeamRuntimeListFieldEditor;
+import org.jboss.tools.seam.ui.wizard.IParameter;
+import org.jboss.tools.seam.ui.wizard.SeamWizardFactory;
+import org.jboss.tools.seam.ui.wizard.SeamWizardUtils;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * Seam Settings Preference Page
+ * @author Alexey Kazakov
+ */
+public class SeamSettingsPreferencePage extends PropertyPage implements PropertyChangeListener {
+
+ private Map<String,IFieldEditor> editorRegistry = new HashMap<String,IFieldEditor>();
+ private IProject project;
+ private IProject warProject;
+ private IEclipsePreferences preferences;
+ private ISeamProject warSeamProject;
+ private boolean suportSeam;
+ private boolean runtimeIsSelected;
+ private List<Group> groups = new ArrayList<Group>();
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.dialogs.PropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
+ */
+ @Override
+ public void setElement(IAdaptable element) {
+ super.setElement(element);
+ project = (IProject) getElement().getAdapter(IProject.class);
+ warProject = SeamWizardUtils.getRootSeamProject(project);
+ if(warProject!=null) {
+ preferences = SeamCorePlugin.getSeamPreferences(warProject);
+ warSeamProject = SeamCorePlugin.getSeamProject(warProject, false);
+ } else {
+ preferences = SeamCorePlugin.getSeamPreferences(project);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
+ */
+ @Override
+ protected Control createContents(Composite parent) {
+ Composite root = new Composite(parent, SWT.NONE);
+
+ GridData gd = new GridData();
+
+ gd.horizontalSpan = 1;
+ gd.horizontalAlignment = GridData.FILL;
+ gd.grabExcessHorizontalSpace = true;
+ gd.grabExcessVerticalSpace = false;
+
+ GridLayout gridLayout = new GridLayout(1, false);
+ root.setLayout(gridLayout);
+
+ Composite generalGroup = new Composite(root, SWT.NONE);
+ generalGroup.setLayoutData(gd);
+ gridLayout = new GridLayout(4, false);
+
+ generalGroup.setLayout(gridLayout);
+
+ IFieldEditor seamSupportCheckBox = IFieldEditorFactory.INSTANCE.createCheckboxEditor(
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT, warSeamProject!=null);
+ seamSupportCheckBox.addPropertyChangeListener(new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ Object value = evt.getNewValue();
+ if (value instanceof Boolean) {
+ boolean v = ((Boolean) value).booleanValue();
+ setEnabledSeamSuport(v);
+ }
+ }
+ });
+ registerEditor(seamSupportCheckBox, generalGroup);
+
+ IFieldEditor seamRuntimeEditor =
+ SeamWizardFactory.createSeamRuntimeSelectionFieldEditor(
+ getSeamVersions(),
+ getSeamRuntimeName());
+ seamRuntimeEditor.addPropertyChangeListener(new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ Object value = evt.getNewValue();
+ if(value.toString().length()>0) {
+ setRuntimeIsSelected(true);
+ } else {
+ setRuntimeIsSelected(false);
+ }
+ }
+ });
+ registerEditor(seamRuntimeEditor, generalGroup);
+
+ IFieldEditor projectNameEditor =
+ IFieldEditorFactory.INSTANCE.createUneditableTextEditor(
+ IParameter.SEAM_PROJECT_NAME,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_SEAM_PROJECT,
+ getPrefValue(
+ IParameter.SEAM_PROJECT_NAME,
+ getSeamProjectName()));
+
+ registerEditor(projectNameEditor, generalGroup);
+
+ IFieldEditor connProfileEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfile(), ValidatorFactory.NO_ERRORS_VALIDATOR);
+ registerEditor(connProfileEditor, generalGroup);
+
+ Group deploymentGroup = createGroup(
+ root,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_DEPLOYMENT,
+ 4);
+
+ IFieldEditor deployTypeEditor = IFieldEditorFactory.INSTANCE.createRadioEditor(
+ ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS,
+ Arrays.asList(new String[] {ISeamFacetDataModelProperties.DEPLOY_AS_WAR.toUpperCase(), ISeamFacetDataModelProperties.DEPLOY_AS_EAR.toUpperCase()}),
+ Arrays.asList(new Object[] {ISeamFacetDataModelProperties.DEPLOY_AS_WAR, ISeamFacetDataModelProperties.DEPLOY_AS_EAR}),
+ getDeployAsValue());
+
+ deployTypeEditor.addPropertyChangeListener(new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ setEnabledDeploymentGroup();
+ }
+ });
+
+ registerEditor(deployTypeEditor, deploymentGroup);
+
+ IFieldEditor ejbProjectEditor = SeamWizardFactory.createSeamProjectSelectionFieldEditor(
+ ISeamFacetDataModelProperties.SEAM_EJB_PROJECT,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_EJB_PROJECT,
+ getEjbProjectName(),
+ true);
+ registerEditor(ejbProjectEditor, deploymentGroup);
+
+ Group viewGroup = createGroup(
+ root,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_VIEW,
+ 3);
+
+ IFieldEditor viewFolderEditor = SeamWizardFactory.createViewFolderFieldEditor(getViewFolder());
+ registerEditor(viewFolderEditor, viewGroup);
+
+ Group modelGroup = createGroup(root,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_MODEL,
+ 3);
+
+ String sourceFolder = getModelSourceFolder();
+ IFieldEditor modelSourceFolderEditor =
+ IFieldEditorFactory.INSTANCE.createBrowseSourceFolderEditor(
+ ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_SOURCE_FOLDER,
+ sourceFolder);
+
+ final IFieldEditor modelPackageEditor =
+ IFieldEditorFactory.INSTANCE.createBrowsePackageEditor(
+ ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_PACKAGE, sourceFolder!=null?sourceFolder:"",
+ getPrefValue(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, ""));
+
+ modelSourceFolderEditor.addPropertyChangeListener(new PropertyChangeListener(){
+ public void propertyChange(PropertyChangeEvent evt) {
+ modelPackageEditor.setData(IParameter.SOURCE_FOLDER_PATH, getValue(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER));
+ }
+ });
+
+ registerEditor(modelSourceFolderEditor, modelGroup);
+ registerEditor(modelPackageEditor, modelGroup);
+
+ Group actionGroup = createGroup(root,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_ACTION,
+ 3);
+
+ sourceFolder = getActionSourceFolder();
+ IFieldEditor actionSourceFolderEditor =
+ IFieldEditorFactory.INSTANCE.createBrowseSourceFolderEditor(
+ ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_SOURCE_FOLDER,
+ sourceFolder);
+
+ final IFieldEditor actionPackageEditor =
+ IFieldEditorFactory.INSTANCE.createBrowsePackageEditor(
+ ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_PACKAGE, sourceFolder!=null?sourceFolder:"",
+ getPrefValue(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, ""));
+
+ actionSourceFolderEditor.addPropertyChangeListener(new PropertyChangeListener(){
+ public void propertyChange(PropertyChangeEvent evt) {
+ actionPackageEditor.setData(IParameter.SOURCE_FOLDER_PATH, getValue(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER));
+ }
+ });
+
+ registerEditor(actionSourceFolderEditor, actionGroup);
+ registerEditor(actionPackageEditor, actionGroup);
+
+ Group testGroup = createGroup(root,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_TEST,
+ 3);
+
+ IFieldEditor createTestCheckBox = IFieldEditorFactory.INSTANCE.createCheckboxEditor(
+ ISeamFacetDataModelProperties.TEST_CREATING, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_CREATE_TEST, shouldCreateTests());
+ createTestCheckBox.addPropertyChangeListener(new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ Object value = evt.getNewValue();
+ if (value instanceof Boolean) {
+ setEnabledTestGroup();
+ }
+ }
+ });
+
+ registerEditor(createTestCheckBox, testGroup);
+
+ IFieldEditor testProjectEditor = SeamWizardFactory.createSeamProjectSelectionFieldEditor(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_TEST_PROJECT, getTestProjectName(),false);
+ registerEditor(testProjectEditor, testGroup);
+
+ sourceFolder = getTestSourceFolder();
+ IFieldEditor testSourceFolderEditor =
+ IFieldEditorFactory.INSTANCE.createBrowseSourceFolderEditor(
+ ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_SOURCE_FOLDER,
+ sourceFolder);
+
+ final IFieldEditor testPackageEditor =
+ IFieldEditorFactory.INSTANCE.createBrowsePackageEditor(
+ ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME,
+ SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_PACKAGE, sourceFolder!=null?sourceFolder:"",
+ getPrefValue(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, ""));
+
+ testSourceFolderEditor.addPropertyChangeListener(new PropertyChangeListener(){
+ public void propertyChange(PropertyChangeEvent evt) {
+ testPackageEditor.setData(IParameter.SOURCE_FOLDER_PATH, getValue(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER));
+ }
+ });
+
+ registerEditor(testSourceFolderEditor, testGroup);
+ registerEditor(testPackageEditor, testGroup);
+
+ setEnabledSeamSuport(warSeamProject!=null);
+ setRuntimeIsSelected(getSeamRuntimeName().length()>0);
+
+ validate();
+
+ return root;
+ }
+
+ private boolean shouldCreateTests() {
+ String value = getPrefValue(ISeamFacetDataModelProperties.TEST_CREATING, "false");
+ return Boolean.parseBoolean(value);
+ }
+
+ private String getPrefValue(String prefName,String defaultValue) {
+ return preferences.get(
+ prefName,
+ defaultValue);
+ }
+
+ private Group createGroup(Composite parent, String title, int rows) {
+ return createGroupWithSpan(parent,title,rows,1);
+ }
+
+ private Group createGroupWithSpan(Composite parent, String title, int rows, int span) {
+ GridData gd;
+ GridLayout gridLayout;
+ gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
+ gd.horizontalSpan = span;
+ gd.horizontalAlignment = GridData.FILL;
+ gd.grabExcessHorizontalSpace = true;
+ gd.grabExcessVerticalSpace = false;
+
+ Group newGroup = new Group(parent, SWT.NONE);
+ newGroup.setLayoutData(gd);
+ newGroup.setText(title);
+
+ gridLayout = new GridLayout(rows, false);
+ newGroup.setLayout(gridLayout);
+ groups.add(newGroup);
+ return newGroup;
+ }
+
+ private String getModelSourceFolder() {
+ String folder = null;
+ if(preferences!=null) {
+ folder = preferences.get(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER, null);
+ }
+ if(folder==null) {
+ SeamProjectsSet set = new SeamProjectsSet(project);
+ IFolder f = set.getModelFolder();
+ folder = f!=null?f.getFullPath().toString():"";
+ }
+ return folder;
+ }
+
+ private String getActionSourceFolder() {
+ String folder = null;
+ if(preferences!=null) {
+ folder = preferences.get(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER, null);
+ }
+ if(folder==null) {
+ SeamProjectsSet set = new SeamProjectsSet(project);
+ IFolder f = set.getActionFolder();
+ folder = f!=null?f.getFullPath().toString():"";
+ }
+ return folder;
+ }
+
+ private String getTestSourceFolder() {
+ String folder = null;
+ if(preferences!=null) {
+ folder = preferences.get(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER, null);
+ }
+ if(folder==null) {
+ SeamProjectsSet set = new SeamProjectsSet(project);
+ IFolder f = set.getTestsFolder();
+ folder = f!=null?f.getFullPath().toString():"";
+ }
+ return folder;
+ }
+
+ private String getViewFolder() {
+ String folder = null;
+ if(preferences!=null) {
+ folder = preferences.get(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, null);
+ }
+ if(folder==null) {
+ SeamProjectsSet set = new SeamProjectsSet(project);
+ IFolder f = set.getViewsFolder();
+ folder = f!=null?f.getFullPath().toString():"";
+ }
+ return folder;
+ }
+
+ private List<String> getProfileNameList() {
+ IConnectionProfile[] profiles = ProfileManager.getInstance()
+ .getProfilesByCategory("org.eclipse.datatools.connectivity.db.category"); //$NON-NLS-1$
+ List<String> names = new ArrayList<String>();
+ for (IConnectionProfile connectionProfile : profiles) {
+ names.add(connectionProfile.getName());
+ }
+ return names;
+ }
+
+ private String getConnectionProfile() {
+ String defaultDs = SeamProjectPreferences.getStringPreference(
+ SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE);
+ return getProfileNameList().contains(defaultDs)?defaultDs:""; //$NON-NLS-1$
+ }
+
+ private String getEjbProjectName() {
+ if(preferences!=null) {
+ return preferences.get(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, project.getName());
+ }
+ return project.getName();
+ }
+
+ private Object getDeployAsValue() {
+ if(preferences!=null) {
+ return preferences.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ISeamFacetDataModelProperties.DEPLOY_AS_WAR);
+ }
+ return ISeamFacetDataModelProperties.DEPLOY_AS_WAR;
+ }
+
+ private void validate() {
+ boolean warning = false;
+
+ if(!isSeamSupported()) {
+ setValid(true);
+ setErrorMessage(null);
+ setMessage(null, IMessageProvider.WARNING);
+ return;
+ }
+ if(!runtimeIsSelected) {
+ setMessage(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED, IMessageProvider.WARNING);
+ warning = true;
+ } else {
+ String value = getValue(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME);
+ if(SeamRuntimeManager.getInstance().findRuntimeByName(value) == null) {
+ setErrorMessage("Runtime " + value + " does not exist.");
+ setValid(false);
+ return;
+ }
+ }
+
+ setValid(true);
+ setErrorMessage(null);
+ if(!warning) {
+ setMessage(null, IMessageProvider.WARNING);
+ }
+ }
+
+ private String getSeamRuntimeName() {
+ if(preferences!=null) {
+ return preferences.get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, "");
+ }
+ return "";
+ }
+
+ private String getSeamProjectName() {
+ return warProject!=null ? warProject.getName() : project.getName();
+ }
+
+ private String getTestProjectName() {
+ String projectName = "";
+ if(preferences!=null) {
+ projectName = preferences.get(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, getSeamProjectName());
+ }
+ return projectName;
+ }
+
+ /* (non-Javadoc)
+ * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+ */
+ public void propertyChange(PropertyChangeEvent evt) {
+ validate();
+ }
+
+ private void registerEditor(IFieldEditor editor, Composite parent) {
+ editorRegistry.put(editor.getName(), editor);
+ editor.doFillIntoGrid(parent);
+ editor.addPropertyChangeListener(this);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.preference.PreferencePage#performOk()
+ */
+ @Override
+ public boolean performOk() {
+ if (isSeamSupported()) {
+ addSeamSupport();
+ storeSettigs();
+ } else {
+ removeSeamSupport();
+ }
+ return true;
+ }
+
+ private void storeSettigs() {
+ IScopeContext projectScope = new ProjectScope(project);
+ IEclipsePreferences prefs = projectScope.getNode(SeamCorePlugin.PLUGIN_ID);
+
+ prefs.put(ISeamFacetDataModelProperties.SEAM_SETTINGS_VERSION,
+ ISeamFacetDataModelProperties.SEAM_SETTINGS_VERSION_1_1);
+
+ prefs.put(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
+ getValue(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS));
+
+ prefs.put(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
+ getValue(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME));
+ prefs.put(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
+ getValue(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE));
+ prefs.put(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME,
+ getValue(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME));
+ prefs.put(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME,
+ getValue(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME));
+ prefs.put(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME,
+ getValue(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME));
+ prefs.put(ISeamFacetDataModelProperties.TEST_CREATING,
+ getValue(ISeamFacetDataModelProperties.TEST_CREATING));
+ prefs.put(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER,
+ getValue(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER));
+ prefs.put(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT,
+ getValue(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT));
+ prefs.put(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT,
+ getValue(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT));
+ prefs.put(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER,
+ getValue(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER));
+ prefs.put(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER,
+ getValue(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER));
+ try {
+ prefs.flush();
+ } catch (BackingStoreException e) {
+ SeamGuiPlugin.getPluginLog().logError(e);
+ }
+ }
+
+ private String getValue(String editorName) {
+ return editorRegistry.get(editorName).getValue().toString();
+ }
+
+ private boolean isSeamSupported() {
+ return suportSeam;
+ }
+
+ private void setEnabledSeamSuport(boolean enabled) {
+ // just for enabling/disabling groups
+ suportSeam = enabled;
+ if(!enabled) {
+ setEnabledGroups(enabled);
+ // disable all below
+ for (String key : editorRegistry.keySet()) {
+ if(key!=SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT) {
+ editorRegistry.get(key).setEnabled(enabled);
+ }
+ }
+ } else {
+ editorRegistry.get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME).setEnabled(enabled);
+ if(runtimeIsSelected) {
+ setEnabledGroups(enabled);
+ for (String key : editorRegistry.keySet()) {
+ if(key!=SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT
+ && key!=ISeamFacetDataModelProperties.SEAM_TEST_PROJECT
+ && key!=ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER
+ && key!=ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH
+ && key!=ISeamFacetDataModelProperties.SEAM_EJB_PROJECT) {
+ editorRegistry.get(key).setEnabled(enabled);
+ }
+ }
+ setEnabledTestGroup();
+ setEnabledDeploymentGroup();
+ }
+ }
+ }
+
+ private void setEnabledDeploymentGroup() {
+ IFieldEditor deployment =
+ editorRegistry.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS);
+
+ editorRegistry.get(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT)
+ .setEnabled(
+ ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(
+ deployment.getValue()));
+ }
+
+ private void setEnabledTestGroup() {
+ IFieldEditor createTestCheckBox = editorRegistry.get(ISeamFacetDataModelProperties.TEST_CREATING);
+ boolean enabled = ((Boolean)createTestCheckBox.getValue()).booleanValue();
+ editorRegistry.get(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT).setEnabled(enabled);
+ editorRegistry.get(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER).setEnabled(enabled);
+ editorRegistry.get(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME).setEnabled(enabled);
+ }
+
+ private void setEnabledGroups(boolean enabled) {
+ for (Group group : groups) {
+ group.setEnabled(enabled);
+ }
+ }
+
+ private void setRuntimeIsSelected(boolean selected) {
+ runtimeIsSelected = selected;
+ for (String key : editorRegistry.keySet()) {
+ if(key!=SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT && key!=ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME) {
+ editorRegistry.get(key).setEnabled(selected);
+ }
+ }
+ setEnabledGroups(selected);
+ setEnabledTestGroup();
+ setEnabledDeploymentGroup();
+ }
+
+ private void removeSeamSupport() {
+ try {
+ EclipseResourceUtil.removeNatureFromProject(project,
+ ISeamProject.NATURE_ID);
+ } catch (CoreException e) {
+ SeamGuiPlugin.getPluginLog().logError(e);
+ }
+ }
+
+ private void addSeamSupport() {
+ try {
+ EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
+ } catch (CoreException e) {
+ SeamGuiPlugin.getPluginLog().logError(e);
+ }
+ }
+
+ private SeamVersion[] getSeamVersions() {
+ if(warSeamProject != null) {
+ SeamRuntime r = warSeamProject.getRuntime();
+ if(r != null) {
+ return new SeamVersion[]{r.getVersion()};
+ }
+ String jarLocation = getJBossSeamJarLocation();
+ if(jarLocation != null) {
+ String folder = new File(jarLocation).getParent();
+ String vs = SeamRuntimeListFieldEditor.SeamRuntimeWizardPage.getSeamVersion(folder);
+ SeamVersion v = findMatchingVersion(vs);
+ if(v != null) {
+ return new SeamVersion[]{v};
+ }
+ }
+ }
+ return SeamVersion.ALL_VERSIONS;
+ }
+
+ private SeamVersion findMatchingVersion(String vs) {
+ if(vs == null) return null;
+ if(vs.matches(SeamVersion.SEAM_1_2.toString().replace(".", "\\.") + ".*")) {
+ return SeamVersion.SEAM_1_2;
+ }
+ if(vs.matches(SeamVersion.SEAM_2_0.toString().replace(".", "\\.") + ".*")) {
+ return SeamVersion.SEAM_2_0;
+ }
+ return null;
+ }
+
+ private String getJBossSeamJarLocation() {
+ IJavaProject jp = EclipseResourceUtil.getJavaProject(project);
+ if(jp == null) return null;
+ IClasspathEntry[] es = null;
+ try {
+ es = jp.getResolvedClasspath(true);
+ } catch (JavaModelException e) {
+ //ignore
+ return null;
+ }
+ if(es == null) return null;
+ for (int i = 0; i < es.length; i++) {
+ IPath p = es[i].getPath();
+ if(p != null && p.lastSegment().equalsIgnoreCase("jboss-seam.jar")) {
+ IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(p);
+ if(f != null && f.exists()) return f.getLocation().toString();
+ }
+ }
+ return null;
+ }
+}
\ No newline at end of file
Deleted: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java 2008-03-11 14:27:53 UTC (rev 6843)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java 2008-03-11 14:31:07 UTC (rev 6844)
@@ -1,670 +0,0 @@
- /*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.seam.ui.preferences;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.datatools.connectivity.IConnectionProfile;
-import org.eclipse.datatools.connectivity.ProfileManager;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.seam.core.ISeamProject;
-import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.core.SeamProjectsSet;
-import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences;
-import org.jboss.tools.seam.core.project.facet.SeamRuntime;
-import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
-import org.jboss.tools.seam.core.project.facet.SeamVersion;
-import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
-import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory;
-import org.jboss.tools.seam.ui.widget.editor.IFieldEditor;
-import org.jboss.tools.seam.ui.widget.editor.IFieldEditorFactory;
-import org.jboss.tools.seam.ui.widget.editor.SeamRuntimeListFieldEditor;
-import org.jboss.tools.seam.ui.wizard.IParameter;
-import org.jboss.tools.seam.ui.wizard.SeamWizardFactory;
-import org.jboss.tools.seam.ui.wizard.SeamWizardUtils;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * Seam Settings Preference Page
- * @author Alexey Kazakov
- */
-public class SeamSettingsPreferencePageNew extends PropertyPage implements PropertyChangeListener {
-
- private Map<String,IFieldEditor> editorRegistry = new HashMap<String,IFieldEditor>();
- private IProject project;
- private IProject warProject;
- private IEclipsePreferences preferences;
- private ISeamProject warSeamProject;
- private boolean suportSeam;
- private boolean runtimeIsSelected;
- private List<Group> groups = new ArrayList<Group>();
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.dialogs.PropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
- */
- @Override
- public void setElement(IAdaptable element) {
- super.setElement(element);
- project = (IProject) getElement().getAdapter(IProject.class);
- warProject = SeamWizardUtils.getRootSeamProject(project);
- if(warProject!=null) {
- preferences = SeamCorePlugin.getSeamPreferences(warProject);
- warSeamProject = SeamCorePlugin.getSeamProject(warProject, false);
- } else {
- preferences = SeamCorePlugin.getSeamPreferences(project);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Control createContents(Composite parent) {
- Composite root = new Composite(parent, SWT.NONE);
-
- GridData gd = new GridData();
-
- gd.horizontalSpan = 1;
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
- gd.grabExcessVerticalSpace = false;
-
- GridLayout gridLayout = new GridLayout(1, false);
- root.setLayout(gridLayout);
-
- Composite generalGroup = new Composite(root, SWT.NONE);
- generalGroup.setLayoutData(gd);
- gridLayout = new GridLayout(4, false);
-
- generalGroup.setLayout(gridLayout);
-
- IFieldEditor seamSupportCheckBox = IFieldEditorFactory.INSTANCE.createCheckboxEditor(
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT, warSeamProject!=null);
- seamSupportCheckBox.addPropertyChangeListener(new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- Object value = evt.getNewValue();
- if (value instanceof Boolean) {
- boolean v = ((Boolean) value).booleanValue();
- setEnabledSeamSuport(v);
- }
- }
- });
- registerEditor(seamSupportCheckBox, generalGroup);
-
- IFieldEditor seamRuntimeEditor =
- SeamWizardFactory.createSeamRuntimeSelectionFieldEditor(
- getSeamVersions(),
- getSeamRuntimeName());
- seamRuntimeEditor.addPropertyChangeListener(new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- Object value = evt.getNewValue();
- if(value.toString().length()>0) {
- setRuntimeIsSelected(true);
- } else {
- setRuntimeIsSelected(false);
- }
- }
- });
- registerEditor(seamRuntimeEditor, generalGroup);
-
- IFieldEditor projectNameEditor =
- IFieldEditorFactory.INSTANCE.createUneditableTextEditor(
- IParameter.SEAM_PROJECT_NAME,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_SEAM_PROJECT,
- getPrefValue(
- IParameter.SEAM_PROJECT_NAME,
- getSeamProjectName()));
-
- registerEditor(projectNameEditor, generalGroup);
-
- IFieldEditor connProfileEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfile(), ValidatorFactory.NO_ERRORS_VALIDATOR);
- registerEditor(connProfileEditor, generalGroup);
-
- Group deploymentGroup = createGroup(
- root,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_DEPLOYMENT,
- 4);
-
- IFieldEditor deployTypeEditor = IFieldEditorFactory.INSTANCE.createRadioEditor(
- ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS,
- Arrays.asList(new String[] {ISeamFacetDataModelProperties.DEPLOY_AS_WAR.toUpperCase(), ISeamFacetDataModelProperties.DEPLOY_AS_EAR.toUpperCase()}),
- Arrays.asList(new Object[] {ISeamFacetDataModelProperties.DEPLOY_AS_WAR, ISeamFacetDataModelProperties.DEPLOY_AS_EAR}),
- getDeployAsValue());
-
- deployTypeEditor.addPropertyChangeListener(new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- setEnabledDeploymentGroup();
- }
- });
-
- registerEditor(deployTypeEditor, deploymentGroup);
-
- IFieldEditor ejbProjectEditor = SeamWizardFactory.createSeamProjectSelectionFieldEditor(
- ISeamFacetDataModelProperties.SEAM_EJB_PROJECT,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_EJB_PROJECT,
- getEjbProjectName(),
- true);
- registerEditor(ejbProjectEditor, deploymentGroup);
-
- Group viewGroup = createGroup(
- root,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_VIEW,
- 3);
-
- IFieldEditor viewFolderEditor = SeamWizardFactory.createViewFolderFieldEditor(getViewFolder());
- registerEditor(viewFolderEditor, viewGroup);
-
- Group modelGroup = createGroup(root,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_MODEL,
- 3);
-
- String sourceFolder = getModelSourceFolder();
- IFieldEditor modelSourceFolderEditor =
- IFieldEditorFactory.INSTANCE.createBrowseSourceFolderEditor(
- ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_SOURCE_FOLDER,
- sourceFolder);
-
- final IFieldEditor modelPackageEditor =
- IFieldEditorFactory.INSTANCE.createBrowsePackageEditor(
- ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_PACKAGE, sourceFolder!=null?sourceFolder:"",
- getPrefValue(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, ""));
-
- modelSourceFolderEditor.addPropertyChangeListener(new PropertyChangeListener(){
- public void propertyChange(PropertyChangeEvent evt) {
- modelPackageEditor.setData(IParameter.SOURCE_FOLDER_PATH, getValue(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER));
- }
- });
-
- registerEditor(modelSourceFolderEditor, modelGroup);
- registerEditor(modelPackageEditor, modelGroup);
-
- Group actionGroup = createGroup(root,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_ACTION,
- 3);
-
- sourceFolder = getActionSourceFolder();
- IFieldEditor actionSourceFolderEditor =
- IFieldEditorFactory.INSTANCE.createBrowseSourceFolderEditor(
- ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_SOURCE_FOLDER,
- sourceFolder);
-
- final IFieldEditor actionPackageEditor =
- IFieldEditorFactory.INSTANCE.createBrowsePackageEditor(
- ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_PACKAGE, sourceFolder!=null?sourceFolder:"",
- getPrefValue(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, ""));
-
- actionSourceFolderEditor.addPropertyChangeListener(new PropertyChangeListener(){
- public void propertyChange(PropertyChangeEvent evt) {
- actionPackageEditor.setData(IParameter.SOURCE_FOLDER_PATH, getValue(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER));
- }
- });
-
- registerEditor(actionSourceFolderEditor, actionGroup);
- registerEditor(actionPackageEditor, actionGroup);
-
- Group testGroup = createGroup(root,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_TEST,
- 3);
-
- IFieldEditor createTestCheckBox = IFieldEditorFactory.INSTANCE.createCheckboxEditor(
- ISeamFacetDataModelProperties.TEST_CREATING, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_CREATE_TEST, shouldCreateTests());
- createTestCheckBox.addPropertyChangeListener(new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- Object value = evt.getNewValue();
- if (value instanceof Boolean) {
- setEnabledTestGroup();
- }
- }
- });
-
- registerEditor(createTestCheckBox, testGroup);
-
- IFieldEditor testProjectEditor = SeamWizardFactory.createSeamProjectSelectionFieldEditor(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_TEST_PROJECT, getTestProjectName(),false);
- registerEditor(testProjectEditor, testGroup);
-
- sourceFolder = getTestSourceFolder();
- IFieldEditor testSourceFolderEditor =
- IFieldEditorFactory.INSTANCE.createBrowseSourceFolderEditor(
- ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_SOURCE_FOLDER,
- sourceFolder);
-
- final IFieldEditor testPackageEditor =
- IFieldEditorFactory.INSTANCE.createBrowsePackageEditor(
- ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME,
- SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCES_PAGE_PACKAGE, sourceFolder!=null?sourceFolder:"",
- getPrefValue(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, ""));
-
- testSourceFolderEditor.addPropertyChangeListener(new PropertyChangeListener(){
- public void propertyChange(PropertyChangeEvent evt) {
- testPackageEditor.setData(IParameter.SOURCE_FOLDER_PATH, getValue(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER));
- }
- });
-
- registerEditor(testSourceFolderEditor, testGroup);
- registerEditor(testPackageEditor, testGroup);
-
- setEnabledSeamSuport(warSeamProject!=null);
- setRuntimeIsSelected(getSeamRuntimeName().length()>0);
-
- validate();
-
- return root;
- }
-
- private boolean shouldCreateTests() {
- String value = getPrefValue(ISeamFacetDataModelProperties.TEST_CREATING, "false");
- return Boolean.parseBoolean(value);
- }
-
- private String getPrefValue(String prefName,String defaultValue) {
- return preferences.get(
- prefName,
- defaultValue);
- }
-
- private Group createGroup(Composite parent, String title, int rows) {
- return createGroupWithSpan(parent,title,rows,1);
- }
-
- private Group createGroupWithSpan(Composite parent, String title, int rows, int span) {
- GridData gd;
- GridLayout gridLayout;
- gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
- gd.horizontalSpan = span;
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
- gd.grabExcessVerticalSpace = false;
-
- Group newGroup = new Group(parent, SWT.NONE);
- newGroup.setLayoutData(gd);
- newGroup.setText(title);
-
- gridLayout = new GridLayout(rows, false);
- newGroup.setLayout(gridLayout);
- groups.add(newGroup);
- return newGroup;
- }
-
- private String getModelSourceFolder() {
- String folder = null;
- if(preferences!=null) {
- folder = preferences.get(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER, null);
- }
- if(folder==null) {
- SeamProjectsSet set = new SeamProjectsSet(project);
- IFolder f = set.getModelFolder();
- folder = f!=null?f.getFullPath().toString():"";
- }
- return folder;
- }
-
- private String getActionSourceFolder() {
- String folder = null;
- if(preferences!=null) {
- folder = preferences.get(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER, null);
- }
- if(folder==null) {
- SeamProjectsSet set = new SeamProjectsSet(project);
- IFolder f = set.getActionFolder();
- folder = f!=null?f.getFullPath().toString():"";
- }
- return folder;
- }
-
- private String getTestSourceFolder() {
- String folder = null;
- if(preferences!=null) {
- folder = preferences.get(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER, null);
- }
- if(folder==null) {
- SeamProjectsSet set = new SeamProjectsSet(project);
- IFolder f = set.getTestsFolder();
- folder = f!=null?f.getFullPath().toString():"";
- }
- return folder;
- }
-
- private String getViewFolder() {
- String folder = null;
- if(preferences!=null) {
- folder = preferences.get(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, null);
- }
- if(folder==null) {
- SeamProjectsSet set = new SeamProjectsSet(project);
- IFolder f = set.getViewsFolder();
- folder = f!=null?f.getFullPath().toString():"";
- }
- return folder;
- }
-
- private List<String> getProfileNameList() {
- IConnectionProfile[] profiles = ProfileManager.getInstance()
- .getProfilesByCategory("org.eclipse.datatools.connectivity.db.category"); //$NON-NLS-1$
- List<String> names = new ArrayList<String>();
- for (IConnectionProfile connectionProfile : profiles) {
- names.add(connectionProfile.getName());
- }
- return names;
- }
-
- private String getConnectionProfile() {
- String defaultDs = SeamProjectPreferences.getStringPreference(
- SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE);
- return getProfileNameList().contains(defaultDs)?defaultDs:""; //$NON-NLS-1$
- }
-
- private String getEjbProjectName() {
- if(preferences!=null) {
- return preferences.get(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, project.getName());
- }
- return project.getName();
- }
-
- private Object getDeployAsValue() {
- if(preferences!=null) {
- return preferences.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ISeamFacetDataModelProperties.DEPLOY_AS_WAR);
- }
- return ISeamFacetDataModelProperties.DEPLOY_AS_WAR;
- }
-
- private void validate() {
- boolean warning = false;
-
- if(!isSeamSupported()) {
- setValid(true);
- setErrorMessage(null);
- setMessage(null, IMessageProvider.WARNING);
- return;
- }
- if(!runtimeIsSelected) {
- setMessage(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED, IMessageProvider.WARNING);
- warning = true;
- } else {
- String value = getValue(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME);
- if(SeamRuntimeManager.getInstance().findRuntimeByName(value) == null) {
- setErrorMessage("Runtime " + value + " does not exist.");
- setValid(false);
- return;
- }
- }
-
- setValid(true);
- setErrorMessage(null);
- if(!warning) {
- setMessage(null, IMessageProvider.WARNING);
- }
- }
-
- private String getSeamRuntimeName() {
- if(preferences!=null) {
- return preferences.get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, "");
- }
- return "";
- }
-
- private String getSeamProjectName() {
- return warProject!=null ? warProject.getName() : project.getName();
- }
-
- private String getTestProjectName() {
- String projectName = "";
- if(preferences!=null) {
- projectName = preferences.get(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, getSeamProjectName());
- }
- return projectName;
- }
-
- /* (non-Javadoc)
- * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
- */
- public void propertyChange(PropertyChangeEvent evt) {
- validate();
- }
-
- private void registerEditor(IFieldEditor editor, Composite parent) {
- editorRegistry.put(editor.getName(), editor);
- editor.doFillIntoGrid(parent);
- editor.addPropertyChangeListener(this);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performOk()
- */
- @Override
- public boolean performOk() {
- if (isSeamSupported()) {
- addSeamSupport();
- storeSettigs();
- } else {
- removeSeamSupport();
- }
- return true;
- }
-
- private void storeSettigs() {
- IScopeContext projectScope = new ProjectScope(project);
- IEclipsePreferences prefs = projectScope.getNode(SeamCorePlugin.PLUGIN_ID);
-
- prefs.put(ISeamFacetDataModelProperties.SEAM_SETTINGS_VERSION,
- ISeamFacetDataModelProperties.SEAM_SETTINGS_VERSION_1_1);
-
- prefs.put(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
- getValue(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS));
-
- prefs.put(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- getValue(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME));
- prefs.put(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
- getValue(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE));
- prefs.put(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME,
- getValue(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME));
- prefs.put(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME,
- getValue(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME));
- prefs.put(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME,
- getValue(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME));
- prefs.put(ISeamFacetDataModelProperties.TEST_CREATING,
- getValue(ISeamFacetDataModelProperties.TEST_CREATING));
- prefs.put(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER,
- getValue(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER));
- prefs.put(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT,
- getValue(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT));
- prefs.put(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT,
- getValue(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT));
- prefs.put(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER,
- getValue(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER));
- prefs.put(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER,
- getValue(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER));
- try {
- prefs.flush();
- } catch (BackingStoreException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
- }
- }
-
- private String getValue(String editorName) {
- return editorRegistry.get(editorName).getValue().toString();
- }
-
- private boolean isSeamSupported() {
- return suportSeam;
- }
-
- private void setEnabledSeamSuport(boolean enabled) {
- // just for enabling/disabling groups
- suportSeam = enabled;
- if(!enabled) {
- setEnabledGroups(enabled);
- // disable all below
- for (String key : editorRegistry.keySet()) {
- if(key!=SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT) {
- editorRegistry.get(key).setEnabled(enabled);
- }
- }
- } else {
- editorRegistry.get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME).setEnabled(enabled);
- if(runtimeIsSelected) {
- setEnabledGroups(enabled);
- for (String key : editorRegistry.keySet()) {
- if(key!=SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT
- && key!=ISeamFacetDataModelProperties.SEAM_TEST_PROJECT
- && key!=ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER
- && key!=ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH
- && key!=ISeamFacetDataModelProperties.SEAM_EJB_PROJECT) {
- editorRegistry.get(key).setEnabled(enabled);
- }
- }
- setEnabledTestGroup();
- setEnabledDeploymentGroup();
- }
- }
- }
-
- private void setEnabledDeploymentGroup() {
- IFieldEditor deployment =
- editorRegistry.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS);
-
- editorRegistry.get(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT)
- .setEnabled(
- ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(
- deployment.getValue()));
- }
-
- private void setEnabledTestGroup() {
- IFieldEditor createTestCheckBox = editorRegistry.get(ISeamFacetDataModelProperties.TEST_CREATING);
- boolean enabled = ((Boolean)createTestCheckBox.getValue()).booleanValue();
- editorRegistry.get(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT).setEnabled(enabled);
- editorRegistry.get(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER).setEnabled(enabled);
- editorRegistry.get(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME).setEnabled(enabled);
- }
-
- private void setEnabledGroups(boolean enabled) {
- for (Group group : groups) {
- group.setEnabled(enabled);
- }
- }
-
- private void setRuntimeIsSelected(boolean selected) {
- runtimeIsSelected = selected;
- for (String key : editorRegistry.keySet()) {
- if(key!=SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT && key!=ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME) {
- editorRegistry.get(key).setEnabled(selected);
- }
- }
- setEnabledGroups(selected);
- setEnabledTestGroup();
- setEnabledDeploymentGroup();
- }
-
- private void removeSeamSupport() {
- try {
- EclipseResourceUtil.removeNatureFromProject(project,
- ISeamProject.NATURE_ID);
- } catch (CoreException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
- }
- }
-
- private void addSeamSupport() {
- try {
- EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
- } catch (CoreException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
- }
- }
-
- private SeamVersion[] getSeamVersions() {
- if(warSeamProject != null) {
- SeamRuntime r = warSeamProject.getRuntime();
- if(r != null) {
- return new SeamVersion[]{r.getVersion()};
- }
- String jarLocation = getJBossSeamJarLocation();
- if(jarLocation != null) {
- String folder = new File(jarLocation).getParent();
- String vs = SeamRuntimeListFieldEditor.SeamRuntimeWizardPage.getSeamVersion(folder);
- SeamVersion v = findMatchingVersion(vs);
- if(v != null) {
- return new SeamVersion[]{v};
- }
- }
- }
- return SeamVersion.ALL_VERSIONS;
- }
-
- private SeamVersion findMatchingVersion(String vs) {
- if(vs == null) return null;
- if(vs.matches(SeamVersion.SEAM_1_2.toString().replace(".", "\\.") + ".*")) {
- return SeamVersion.SEAM_1_2;
- }
- if(vs.matches(SeamVersion.SEAM_2_0.toString().replace(".", "\\.") + ".*")) {
- return SeamVersion.SEAM_2_0;
- }
- return null;
- }
-
- private String getJBossSeamJarLocation() {
- IJavaProject jp = EclipseResourceUtil.getJavaProject(project);
- if(jp == null) return null;
- IClasspathEntry[] es = null;
- try {
- es = jp.getResolvedClasspath(true);
- } catch (JavaModelException e) {
- //ignore
- return null;
- }
- if(es == null) return null;
- for (int i = 0; i < es.length; i++) {
- IPath p = es[i].getPath();
- if(p != null && p.lastSegment().equalsIgnoreCase("jboss-seam.jar")) {
- IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(p);
- if(f != null && f.exists()) return f.getLocation().toString();
- }
- }
- return null;
- }
-}
\ No newline at end of file
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6843 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-03-11 10:27:53 -0400 (Tue, 11 Mar 2008)
New Revision: 6843
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1322
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java 2008-03-11 14:23:43 UTC (rev 6842)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java 2008-03-11 14:27:53 UTC (rev 6843)
@@ -34,6 +34,7 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -47,11 +48,11 @@
import org.jboss.tools.seam.core.SeamProjectsSet;
import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
+import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.jboss.tools.seam.core.project.facet.SeamVersion;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.internal.project.facet.IValidator;
import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory;
import org.jboss.tools.seam.ui.widget.editor.IFieldEditor;
import org.jboss.tools.seam.ui.widget.editor.IFieldEditorFactory;
@@ -124,7 +125,6 @@
if (value instanceof Boolean) {
boolean v = ((Boolean) value).booleanValue();
setEnabledSeamSuport(v);
- validate();
}
}
});
@@ -142,7 +142,6 @@
} else {
setRuntimeIsSelected(false);
}
- validate();
}
});
registerEditor(seamRuntimeEditor, generalGroup);
@@ -157,12 +156,7 @@
registerEditor(projectNameEditor, generalGroup);
- IFieldEditor connProfileEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfile(), new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
- SeamSettingsPreferencePageNew.this.validate();
- return ValidatorFactory.NO_ERRORS;
- }
- });
+ IFieldEditor connProfileEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfile(), ValidatorFactory.NO_ERRORS_VALIDATOR);
registerEditor(connProfileEditor, generalGroup);
Group deploymentGroup = createGroup(
@@ -297,6 +291,8 @@
setEnabledSeamSuport(warSeamProject!=null);
setRuntimeIsSelected(getSeamRuntimeName().length()>0);
+ validate();
+
return root;
}
@@ -417,20 +413,31 @@
}
private void validate() {
-// if(getSeamSupport() && (runtime.getValue()== null || "".equals(runtime.getValue()))) { //$NON-NLS-1$
-//// setValid(false);
-// setMessage(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED, IMessageProvider.WARNING);
-//// setErrorMessage(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED);
-// } else {
-// setValid(true);
-// String value = runtime.getValueAsString();
-// if(Boolean.TRUE.equals(seamEnablement.getValue()) && SeamRuntimeManager.getInstance().findRuntimeByName(value) == null) {
-// setErrorMessage("Runtime " + value + " does not exist.");
-// } else {
-// setErrorMessage(null);
-// setMessage(null, IMessageProvider.WARNING);
-// }
-// }
+ boolean warning = false;
+
+ if(!isSeamSupported()) {
+ setValid(true);
+ setErrorMessage(null);
+ setMessage(null, IMessageProvider.WARNING);
+ return;
+ }
+ if(!runtimeIsSelected) {
+ setMessage(SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_RUNTIME_IS_NOT_SELECTED, IMessageProvider.WARNING);
+ warning = true;
+ } else {
+ String value = getValue(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME);
+ if(SeamRuntimeManager.getInstance().findRuntimeByName(value) == null) {
+ setErrorMessage("Runtime " + value + " does not exist.");
+ setValid(false);
+ return;
+ }
+ }
+
+ setValid(true);
+ setErrorMessage(null);
+ if(!warning) {
+ setMessage(null, IMessageProvider.WARNING);
+ }
}
private String getSeamRuntimeName() {
@@ -456,11 +463,13 @@
* @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
*/
public void propertyChange(PropertyChangeEvent evt) {
+ validate();
}
private void registerEditor(IFieldEditor editor, Composite parent) {
editorRegistry.put(editor.getName(), editor);
editor.doFillIntoGrid(parent);
+ editor.addPropertyChangeListener(this);
}
/*
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6842 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-11 10:23:43 -0400 (Tue, 11 Mar 2008)
New Revision: 6842
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
Log:
JBIDE-1322
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-03-11 14:12:34 UTC (rev 6841)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-03-11 14:23:43 UTC (rev 6842)
@@ -73,7 +73,7 @@
}
Composite top = new GridLayoutComposite(parent);
- Composite projectComposite = new GridLayoutComposite(top, SWT.NONE, 3);
+ Composite projectComposite = new GridLayoutComposite(top, SWT.NONE, 4);
projectEditor.doFillIntoGrid(projectComposite);
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6841 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: widget/editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-03-11 10:12:34 -0400 (Tue, 11 Mar 2008)
New Revision: 6841
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/ShowProjectSettingsAction.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectSelectionDialog.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java
Log:
JBIDE-1322
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-03-11 14:04:58 UTC (rev 6840)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-03-11 14:12:34 UTC (rev 6841)
@@ -180,6 +180,8 @@
public static String SEAM_PROJECT_LABEL_PROVIDER_SEAM_COMPONENTS;
public static String SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT;
+
+ public static String SEAM_PROJECT_SELECTION_DIALOG_SHOW_ALL_PROJECTS;
public static String SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT;
@@ -306,6 +308,8 @@
public static String SEAM_WIZARD_FACTORY_SEAM_PROJECT;
public static String SELECT_SEAM_PROJECT_ACTION_BROWSE;
+
+ public static String SHOW_PROJECT_SETTINGS_ACTION;
public static String SWT_FIELD_EDITOR_FACTORY_BROWS;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-03-11 14:04:58 UTC (rev 6840)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-03-11 14:12:34 UTC (rev 6841)
@@ -35,6 +35,7 @@
SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME=Database Catalog Name:
SEAM_PROJECT_WIZARD_PAGE1_MULTIPAGE_EDITOR_FILE=Multi-page Editor File
SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT=Seam Web Projects
+SEAM_PROJECT_SELECTION_DIALOG_SHOW_ALL_PROJECTS=Show all projects
SEAM_PROJECT_LABEL_PROVIDER_SEAM_COMPONENTS=Seam Components
SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE=Entity master page
SEAM_ENTITY_WIZARD_ENTITY_CREATING_OPERATION=Entity creating operation
@@ -87,6 +88,7 @@
SEAM_WIZARD_FACTORY_SEAM_PROJECT=Seam Project:
SEAM_INSTALL_WIZARD_PAGE_DATABASE=Database
SELECT_SEAM_PROJECT_ACTION_BROWSE=Browse...
+SHOW_PROJECT_SETTINGS_ACTION=Settings...
SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION=Code Generation
SEAM_FORM_WIZARD_FORM_CREATING_OPERATION=Form creating operation
SEAM_WIZARD_FACTORY_LOCAL_INTERFACE_NAME=Local interface name:
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java 2008-03-11 14:04:58 UTC (rev 6840)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/IFieldEditorFactory.java 2008-03-11 14:12:34 UTC (rev 6841)
@@ -159,6 +159,19 @@
*
* @param name
* @param label
+ * @param defaultValue
+ * @param actions
+ * @param validator
+ * @return
+ */
+ public IFieldEditor createButtonFieldEditor(String name, String label,
+ String defaultValue, ButtonFieldEditor.ButtonPressedAction[] actions,
+ IValidator validator);
+
+ /**
+ *
+ * @param name
+ * @param label
* @param values
* @param defaultValue
* @param editable
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java 2008-03-11 14:04:58 UTC (rev 6840)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java 2008-03-11 14:12:34 UTC (rev 6841)
@@ -348,6 +348,18 @@
return editor;
}
+ public IFieldEditor createButtonFieldEditor(String name, String label, String defaultValue, ButtonFieldEditor.ButtonPressedAction[] actions, IValidator validator ) {
+ CompositeEditor editor = new CompositeEditor(name,label, defaultValue);
+ List<IFieldEditor> editors = new ArrayList<IFieldEditor>();
+ editors.add(new LabelFieldEditor(name,label));
+ editors.add(new TextFieldEditor(name,label, defaultValue));
+ for (int i = 0; i < actions.length; i++) {
+ editors.add(new ButtonFieldEditor(name,actions[i],defaultValue));
+ }
+ editor.addFieldEditors(editors.toArray(new IFieldEditor[0]));
+ return editor;
+ }
+
/**
* @param buttonName
* @return
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectSelectionDialog.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectSelectionDialog.java 2008-03-11 14:04:58 UTC (rev 6840)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectSelectionDialog.java 2008-03-11 14:12:34 UTC (rev 6841)
@@ -19,8 +19,14 @@
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.dialogs.ListDialog;
import org.eclipse.ui.model.WorkbenchLabelProvider;
@@ -36,6 +42,8 @@
*
*/
public class SeamProjectSelectionDialog extends ListDialog implements ISelectionChangedListener {
+ Button check;
+ boolean allowAllProjects = false;
/**
* @param parent
@@ -43,6 +51,7 @@
*/
public SeamProjectSelectionDialog(Shell parent, final boolean allowAllProjects) {
super(parent);
+ this.allowAllProjects = allowAllProjects;
setTitle(SeamUIMessages.SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT);
setMessage(SeamUIMessages.SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT);
setLabelProvider(new WorkbenchLabelProvider());
@@ -52,7 +61,8 @@
ArrayList<IProject> seamProjects = new ArrayList<IProject>();
for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
try {
- if(allowAllProjects || (project.hasNature(ISeamProject.NATURE_ID)
+ if((allowAllProjects || (check != null && check.getSelection()))
+ || (project.hasNature(ISeamProject.NATURE_ID)
&& SeamCorePlugin.getSeamPreferences(project)!=null
&& project.getAdapter(IFacetedProject.class)!=null
&& ((IFacetedProject)project.getAdapter(IFacetedProject.class)).hasProjectFacet(ProjectFacetsManager.getProjectFacet("jst.web"))
@@ -96,4 +106,23 @@
public void selectionChanged(SelectionChangedEvent event) {
getOkButton().setEnabled(!event.getSelection().isEmpty());
}
+
+ protected Control createDialogArea(Composite container) {
+ Composite parent = (Composite) super.createDialogArea(container);
+ if(!allowAllProjects) {
+ check = new Button(parent, SWT.CHECK);
+ check.setText(SeamUIMessages.SEAM_PROJECT_SELECTION_DIALOG_SHOW_ALL_PROJECTS);
+ check.setSelection(false);
+ check.addSelectionListener(new SelectionListener() {
+ public void widgetDefaultSelected(SelectionEvent e) {
+ widgetSelected(e);
+ }
+ public void widgetSelected(SelectionEvent e) {
+ TableViewer v = getTableViewer();
+ v.refresh();
+ }
+ });
+ }
+ return parent;
+ }
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2008-03-11 14:04:58 UTC (rev 6840)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java 2008-03-11 14:12:34 UTC (rev 6841)
@@ -56,9 +56,22 @@
* @return
*/
public static IFieldEditor createSeamProjectSelectionFieldEditor(String name, String label, String defaultSelection, boolean allowAllProjects) {
- return IFieldEditorFactory.INSTANCE.createButtonFieldEditor(
+ if(allowAllProjects) {
+ return IFieldEditorFactory.INSTANCE.createButtonFieldEditor(
+ name, label, defaultSelection,
+ new SelectSeamProjectAction(allowAllProjects), ValidatorFactory.NO_ERRORS_VALIDATOR);
+ }
+ ShowProjectSettingsAction settingsAction = new ShowProjectSettingsAction();
+ ButtonFieldEditor.ButtonPressedAction[] actions = new ButtonFieldEditor.ButtonPressedAction[]{
+ new SelectSeamProjectAction(allowAllProjects),
+ settingsAction
+ };
+ IFieldEditor editor = IFieldEditorFactory.INSTANCE.createButtonFieldEditor(
name, label, defaultSelection,
- new SelectSeamProjectAction(allowAllProjects), ValidatorFactory.NO_ERRORS_VALIDATOR);
+ actions, ValidatorFactory.NO_ERRORS_VALIDATOR);
+ settingsAction.setEnabled(false);
+ settingsAction.setEditor(editor);
+ return editor;
}
/**
Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/ShowProjectSettingsAction.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/ShowProjectSettingsAction.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/ShowProjectSettingsAction.java 2008-03-11 14:12:34 UTC (rev 6841)
@@ -0,0 +1,65 @@
+package org.jboss.tools.seam.ui.wizard;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.preference.PreferenceDialog;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.ui.widget.editor.ButtonFieldEditor;
+import org.jboss.tools.seam.ui.widget.editor.CompositeEditor;
+import org.jboss.tools.seam.ui.widget.editor.IFieldEditor;
+
+public class ShowProjectSettingsAction extends ButtonFieldEditor.ButtonPressedAction implements PropertyChangeListener {
+ IFieldEditor editor;
+ IFieldEditor button;
+
+ public ShowProjectSettingsAction() {
+ super(SeamUIMessages.SHOW_PROJECT_SETTINGS_ACTION);
+ }
+
+ public void setEditor(IFieldEditor editor) {
+ this.editor = editor;
+ editor.addPropertyChangeListener(this);
+ CompositeEditor c = (CompositeEditor)editor;
+ List<IFieldEditor> es = c.getEditors();
+ button = es.get(es.size() - 1);
+ }
+
+ @Override
+ public void run() {
+ if(editor == null) return;
+ IProject p = getSelectedProject();
+ if(p == null) return;
+ PreferenceDialog prefsdlg = PreferencesUtil.createPropertyDialogOn(
+ PlatformUI.getWorkbench().getDisplay().getActiveShell(),
+ p,
+ "org.jboss.tools.seam.ui.propertyPages.SeamSettingsPreferencePage",
+ new String[]{"org.jboss.tools.seam.ui.propertyPages.SeamSettingsPreferencePage"},
+ null);
+
+ prefsdlg.open();
+ }
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ IProject p = getSelectedProject();
+ boolean enabled = p != null;
+ if(isEnabled() != enabled) {
+ setEnabled(enabled);
+ button.setEnabled(enabled);
+ }
+ }
+
+ IProject getSelectedProject() {
+ String s = editor.getValueAsString();
+ if(s == null || s.length() == 0) return null;
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(s);
+ if(p == null || !p.isAccessible()) return null;
+ return p;
+ }
+
+}
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6840 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-03-11 10:04:58 -0400 (Tue, 11 Mar 2008)
New Revision: 6840
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1878
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2008-03-11 13:44:19 UTC (rev 6839)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2008-03-11 14:04:58 UTC (rev 6840)
@@ -21,33 +21,22 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IViewSite;
import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.internal.decorators.DecoratorManager;
import org.eclipse.ui.navigator.CommonNavigator;
-import org.eclipse.ui.progress.UIJob;
-import org.jboss.tools.common.model.XJob;
-import org.jboss.tools.common.test.util.TestProjectProvider;
-import org.jboss.tools.jst.web.ui.WebDevelopmentPerspectiveFactory;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamPackage;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.ui.ISeamUiConstants;
-import org.jboss.tools.seam.ui.views.actions.ScopePresentationActionProvider;
import org.jboss.tools.seam.ui.views.actions.SeamViewLayoutActionGroup.SeamContributionItem;
import org.jboss.tools.test.util.JUnitUtils;
-import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.test.util.WorkbenchUtils;
import org.jboss.tools.test.util.xpl.EditorTestHelper;
@@ -74,12 +63,6 @@
EditorTestHelper.joinBackgroundActivities();
}
- @Override
- protected void tearDown() throws Exception {
- ResourcesUtils.deleteProject("TestComponentView");
- EditorTestHelper.joinBackgroundActivities();
- }
-
public void testAddComponentInXmlFile() throws CoreException{
CommonNavigator navigator = getSeamComponentsView();
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6839 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-03-11 09:44:19 -0400 (Tue, 11 Mar 2008)
New Revision: 6839
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1322
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java 2008-03-11 13:32:16 UTC (rev 6838)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePageNew.java 2008-03-11 13:44:19 UTC (rev 6839)
@@ -295,7 +295,7 @@
registerEditor(testPackageEditor, testGroup);
setEnabledSeamSuport(warSeamProject!=null);
-// setRuntimeIsSelected(getSeamRuntimeName().length()>0);
+ setRuntimeIsSelected(getSeamRuntimeName().length()>0);
return root;
}
@@ -527,9 +527,9 @@
private void setEnabledSeamSuport(boolean enabled) {
// just for enabling/disabling groups
- setEnabledGroups(enabled);
suportSeam = enabled;
if(!enabled) {
+ setEnabledGroups(enabled);
// disable all below
for (String key : editorRegistry.keySet()) {
if(key!=SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT) {
@@ -537,19 +537,22 @@
}
}
} else {
- for (String key : editorRegistry.keySet()) {
- if(key!=SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT
- && key!=ISeamFacetDataModelProperties.SEAM_TEST_PROJECT
- && key!=ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER
- && key!=ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH
- && key!=ISeamFacetDataModelProperties.SEAM_EJB_PROJECT) {
- editorRegistry.get(key).setEnabled(enabled);
+ editorRegistry.get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME).setEnabled(enabled);
+ if(runtimeIsSelected) {
+ setEnabledGroups(enabled);
+ for (String key : editorRegistry.keySet()) {
+ if(key!=SeamPreferencesMessages.SEAM_SETTINGS_PREFERENCE_PAGE_SEAM_SUPPORT
+ && key!=ISeamFacetDataModelProperties.SEAM_TEST_PROJECT
+ && key!=ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER
+ && key!=ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_PATH
+ && key!=ISeamFacetDataModelProperties.SEAM_EJB_PROJECT) {
+ editorRegistry.get(key).setEnabled(enabled);
+ }
}
+ setEnabledTestGroup();
+ setEnabledDeploymentGroup();
}
- setEnabledTestGroup();
- setEnabledDeploymentGroup();
}
-
}
private void setEnabledDeploymentGroup() {
16 years, 3 months
- 1
- 0
JBoss Tools SVN: r6838 - in trunk/jbpm/docs/reference/en: images/The_JBoss_jBPM_Int_Mech and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ykryvinchanka
Date: 2008-03-11 09:32:16 -0400 (Tue, 11 Mar 2008)
New Revision: 6838
Added:
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_6.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_7.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_8.png
trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_9.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_1.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_2.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_3.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_4.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_5.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_6.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_7.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_8.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_9.png
trunk/jbpm/docs/reference/en/images/runtime_installation/runtime_installation_1.png
trunk/jbpm/docs/reference/en/images/the_views/the_views_0.png
trunk/jbpm/docs/reference/en/images/the_views/the_views_1.png
trunk/jbpm/docs/reference/en/images/the_views/the_views_10.png
trunk/jbpm/docs/reference/en/images/the_views/the_views_2.png
trunk/jbpm/docs/reference/en/images/the_views/the_views_3.png
trunk/jbpm/docs/reference/en/images/the_views/the_views_4.png
trunk/jbpm/docs/reference/en/images/the_views/the_views_5.png
trunk/jbpm/docs/reference/en/images/the_views/the_views_6.png
trunk/jbpm/docs/reference/en/images/the_views/the_views_7.png
trunk/jbpm/docs/reference/en/images/the_views/the_views_8.png
trunk/jbpm/docs/reference/en/images/the_views/the_views_9.png
Removed:
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/defaltImage.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_1a.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_1b.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2a.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2b.png
trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/defaltImage.png
trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_10.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour1.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour10.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour11.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour12.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour13.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour14.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour15.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour2.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour2_b.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour3.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour4.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour5.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour6.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour7.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour8.png
trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour9.png
trunk/jbpm/docs/reference/en/images/runtime_installation/runtime_installation1.png
trunk/jbpm/docs/reference/en/images/the_views/the_views.png
trunk/jbpm/docs/reference/en/images/the_views/the_views1.png
trunk/jbpm/docs/reference/en/images/the_views/the_views10.png
trunk/jbpm/docs/reference/en/images/the_views/the_views2.png
trunk/jbpm/docs/reference/en/images/the_views/the_views3.png
trunk/jbpm/docs/reference/en/images/the_views/the_views4.png
trunk/jbpm/docs/reference/en/images/the_views/the_views5.png
trunk/jbpm/docs/reference/en/images/the_views/the_views6.png
trunk/jbpm/docs/reference/en/images/the_views/the_views7.png
trunk/jbpm/docs/reference/en/images/the_views/the_views8.png
trunk/jbpm/docs/reference/en/images/the_views/the_views9.png
Modified:
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_1.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_3.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_4.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_5.png
trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml
trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml
trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml
trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml
trunk/jbpm/docs/reference/en/modules/the_views.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-262 unusable images deleted
Deleted: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/defaltImage.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_1.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_1a.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_1b.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2a.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2b.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_3.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_4.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_5.png
===================================================================
(Binary files differ)
Added: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_6.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_7.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_7.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_8.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_8.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/defaltImage.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_10.png
===================================================================
(Binary files differ)
Added: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_9.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_9.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour1.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour10.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour11.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour12.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour13.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour14.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour15.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour2.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour2_b.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour3.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour4.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour5.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour6.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour7.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour8.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour9.png
===================================================================
(Binary files differ)
Added: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_3.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_4.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_5.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_6.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_7.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_7.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_8.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_8.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_9.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/guided_tour_jboss_jbpmgpd/guided_tour_9.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/jbpm/docs/reference/en/images/runtime_installation/runtime_installation1.png
===================================================================
(Binary files differ)
Added: trunk/jbpm/docs/reference/en/images/runtime_installation/runtime_installation_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/runtime_installation/runtime_installation_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/jbpm/docs/reference/en/images/the_views/the_views.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/the_views/the_views1.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/the_views/the_views10.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/the_views/the_views2.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/the_views/the_views3.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/the_views/the_views4.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/the_views/the_views5.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/the_views/the_views6.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/the_views/the_views7.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/the_views/the_views8.png
===================================================================
(Binary files differ)
Deleted: trunk/jbpm/docs/reference/en/images/the_views/the_views9.png
===================================================================
(Binary files differ)
Added: trunk/jbpm/docs/reference/en/images/the_views/the_views_0.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/the_views/the_views_0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/the_views/the_views_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/the_views/the_views_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/the_views/the_views_10.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/the_views/the_views_10.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/the_views/the_views_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/the_views/the_views_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/the_views/the_views_3.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/the_views/the_views_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/the_views/the_views_4.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/the_views/the_views_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/the_views/the_views_5.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/the_views/the_views_5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/the_views/the_views_6.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/the_views/the_views_6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/the_views/the_views_7.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/the_views/the_views_7.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/the_views/the_views_8.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/the_views/the_views_8.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/docs/reference/en/images/the_views/the_views_9.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/docs/reference/en/images/the_views/the_views_9.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml 2008-03-11 13:31:57 UTC (rev 6837)
+++ trunk/jbpm/docs/reference/en/modules/Test_Drive_Proc.xml 2008-03-11 13:32:16 UTC (rev 6838)
@@ -34,7 +34,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/Test_Drive_Proc/test_driv_proc.png"/>
+ <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_1.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -57,7 +57,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_1a.png"/>
+ <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_2.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -70,7 +70,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_1b.png"/>
+ <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_3.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -82,7 +82,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_2a.png"/>
+ <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_4.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -99,7 +99,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_2b.png"/>
+ <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_5.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -118,7 +118,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_3.png" scale="75"/>
+ <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_6.png" scale="75"/>
</imageobject>
</mediaobject>
</figure>
@@ -144,7 +144,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_4.png" scale="75"/>
+ <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_7.png" scale="75"/>
</imageobject>
</mediaobject>
</figure>
@@ -155,7 +155,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_5.png" scale="75"/>
+ <imagedata fileref="images/Test_Drive_Proc/test_driv_proc_8.png" scale="75"/>
</imageobject>
</mediaobject>
</figure>
Modified: trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml 2008-03-11 13:31:57 UTC (rev 6837)
+++ trunk/jbpm/docs/reference/en/modules/The_JBoss_jBPM_Int_Mech.xml 2008-03-11 13:32:16 UTC (rev 6838)
@@ -217,7 +217,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_10.png"
+ <imagedata fileref="images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_9.png"
scale="70"/>
</imageobject>
</mediaobject>
Modified: trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml 2008-03-11 13:31:57 UTC (rev 6837)
+++ trunk/jbpm/docs/reference/en/modules/guided_tour_jboss_jbpmgpd.xml 2008-03-11 13:32:16 UTC (rev 6838)
@@ -31,7 +31,7 @@
<title>New Project Dialog</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour1.png"/>
+ <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour_1.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -45,7 +45,7 @@
<title>Process Name and Location</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour2.png"/>
+ <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour_2.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -60,7 +60,7 @@
<title>Process Name and Location</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour2_b.png"/>
+ <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour_9.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -82,7 +82,7 @@
<title>Layout of the Process Project</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour3.png"/>
+ <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour_3.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -105,7 +105,7 @@
<title>The Select Wizard Page</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour4.png"/>
+ <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour_4.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -122,7 +122,7 @@
<title>The Create New Process Definion Page</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour5.png"/>
+ <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour_5.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -135,7 +135,7 @@
<title>The Process Definition Editor</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour6.png"
+ <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour_6.png"
scale="60"/>
</imageobject>
</mediaobject>
@@ -182,7 +182,7 @@
<title>A Simple Process With Three Nodes</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour7.png"
+ <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour_7.png"
scale="60"/>
</imageobject>
</mediaobject>
@@ -207,7 +207,7 @@
<title>A Simple Process With Transitions</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour8.png"
+ <imagedata fileref="images/guided_tour_jboss_jbpmgpd/guided_tour_8.png"
scale="60"/>
</imageobject>
</mediaobject>
Modified: trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml 2008-03-11 13:31:57 UTC (rev 6837)
+++ trunk/jbpm/docs/reference/en/modules/jboss_jbpm_runtime_installation.xml 2008-03-11 13:32:16 UTC (rev 6838)
@@ -37,7 +37,7 @@
<title>Adding jBPM Location</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/runtime_installation/runtime_installation1.png"/>
+ <imagedata fileref="images/runtime_installation/runtime_installation_1.png"/>
</imageobject>
</mediaobject>
</figure>
Modified: trunk/jbpm/docs/reference/en/modules/the_views.xml
===================================================================
--- trunk/jbpm/docs/reference/en/modules/the_views.xml 2008-03-11 13:31:57 UTC (rev 6837)
+++ trunk/jbpm/docs/reference/en/modules/the_views.xml 2008-03-11 13:32:16 UTC (rev 6838)
@@ -19,7 +19,7 @@
<title>The jPDL Perspective Views and Editors</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views.png" scale="60"/>
+ <imagedata fileref="images/the_views/the_views_0.png" scale="60"/>
</imageobject>
</mediaobject>
</figure>
@@ -40,7 +40,7 @@
<title>The Overview View</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views1.png"/>
+ <imagedata fileref="images/the_views/the_views_1.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -58,7 +58,7 @@
<title>The Overview</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views2.png"/>
+ <imagedata fileref="images/the_views/the_views_2.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -79,7 +79,7 @@
<title>The Properties View of selected Transition</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views3.png"/>
+ <imagedata fileref="images/the_views/the_views_3.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -98,7 +98,7 @@
<title>The Properties View of Process Definition</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views4.png"/>
+ <imagedata fileref="images/the_views/the_views_4.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -127,7 +127,7 @@
<title>The Diagram mode</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views5.png"/>
+ <imagedata fileref="images/the_views/the_views_5.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -153,7 +153,7 @@
<title>The Source Mode</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views6.png"/>
+ <imagedata fileref="images/the_views/the_views_6.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -171,7 +171,7 @@
<title>The Design Mode</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views7.png"/>
+ <imagedata fileref="images/the_views/the_views_7.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -189,7 +189,7 @@
<title>Adding a Comment</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views8.png"/>
+ <imagedata fileref="images/the_views/the_views_8.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -200,7 +200,7 @@
<title>Comment is added</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views9.png"/>
+ <imagedata fileref="images/the_views/the_views_9.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -218,7 +218,7 @@
<title>The Deployment Mode</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/the_views/the_views10.png"/>
+ <imagedata fileref="images/the_views/the_views_10.png"/>
</imageobject>
</mediaobject>
</figure>
16 years, 3 months
- 1
- 0