JBoss Tools SVN: r3466 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui/dialogs and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-06 00:52:32 -0400 (Thu, 06 Sep 2007)
New Revision: 3466
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/upgrades/UpdatePage20.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
Refactor of launch configurations. Specifically:
Each type (start, stop, twiddle) now have their own launch configuration type, now decoupled.
UI code was simplified immensely
TwiddleDialog and TwiddleLauncher refactored to use new launch type
"Stop" method of ServerBehavior classes modified to use new launches
Fixed classpath bug where users could not modify classpath properly
JBIDE-400
JBIDE-786
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2007-09-05 18:12:31 UTC (rev 3465)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2007-09-06 04:52:32 UTC (rev 3466)
@@ -1,8 +1,6 @@
package org.jboss.ide.eclipse.as.ui.dialogs;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TrayDialog;
import org.eclipse.swt.SWT;
@@ -18,12 +16,11 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.internal.IWorkbenchHelpContextIds;
import org.eclipse.ui.internal.Workbench;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.server.JBossServerLaunchConfiguration;
-import org.jboss.ide.eclipse.as.core.server.TwiddleLauncher;
-import org.jboss.ide.eclipse.as.core.server.TwiddleLauncher.ProcessData;
+import org.jboss.ide.eclipse.as.core.launch.TwiddleLaunchConfiguration;
+import org.jboss.ide.eclipse.as.core.launch.TwiddleLauncher;
+import org.jboss.ide.eclipse.as.core.launch.TwiddleLauncher.ProcessData;
import org.jboss.ide.eclipse.as.ui.Messages;
public class TwiddleDialog extends TrayDialog {
@@ -142,12 +139,9 @@
results.setLayoutData(resultsData);
results.setFont(new Font(null, "Courier New", 8, SWT.NONE));
-
-
// set the default text
try {
- ILaunchConfiguration config = JBossServerLaunchConfiguration.setupLaunchConfiguration(server, JBossServerLaunchConfiguration.TWIDDLE);
- String args = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "");
+ String args = TwiddleLaunchConfiguration.getDefaultArgs(server);
query.setText(args);
query.setFocus();
query.setSelection(args.length());
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2007-09-05 18:12:31 UTC (rev 3465)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2007-09-06 04:52:32 UTC (rev 3466)
@@ -1,74 +1,27 @@
package org.jboss.ide.eclipse.as.ui.launch;
-import java.io.File;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
import org.eclipse.debug.ui.CommonTab;
import org.eclipse.debug.ui.EnvironmentTab;
import org.eclipse.debug.ui.ILaunchConfigurationDialog;
import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.StringVariableSelectionDialog;
import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.internal.debug.ui.launcher.VMArgumentsBlock;
-import org.eclipse.jdt.internal.debug.ui.launcher.WorkingDirectoryBlock;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-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.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.jboss.ide.eclipse.as.core.server.JBossServerLaunchConfiguration;
public class JBossLaunchConfigurationTabGroup extends
AbstractLaunchConfigurationTabGroup {
- private IServer server;
-
- private ILaunchConfiguration launchConfiguration;
- private ILaunchConfigurationWorkingCopy launchWC;
-
-
-
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[10];
int i = 0;
- tabs[i] = new JBossJavaArgumentsTab(JBossJavaArgumentsTab.START);
+// tabs[i] = new JBossJavaArgumentsTab(JBossJavaArgumentsTab.START);
+// tabs[i++].setLaunchConfigurationDialog(dialog);
+// tabs[i] = new JBossJavaArgumentsTab(JBossJavaArgumentsTab.STOP);
+// tabs[i++].setLaunchConfigurationDialog(dialog);
+ tabs[i] = new JavaArgumentsTab();
tabs[i++].setLaunchConfigurationDialog(dialog);
- tabs[i] = new JBossJavaArgumentsTab(JBossJavaArgumentsTab.STOP);
- tabs[i++].setLaunchConfigurationDialog(dialog);
- tabs[i] = new JBossJavaArgumentsTab(JBossJavaArgumentsTab.TWIDDLE);
- tabs[i++].setLaunchConfigurationDialog(dialog);
tabs[i] = new JavaClasspathTab();
tabs[i++].setLaunchConfigurationDialog(dialog);
tabs[i] = new SourceLookupTab();
@@ -85,527 +38,4 @@
System.arraycopy(tabs, 0, tabs2, 0, i);
setTabs(tabs2);
}
- public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
- super.setDefaults(configuration);
- }
-
- public void initializeFrom(ILaunchConfiguration configuration) {
- try {
- server = ServerUtil.getServer(configuration);
-
- ILaunchConfigurationWorkingCopy wc = configuration.getWorkingCopy();
- JBossServerLaunchConfiguration.ensureDefaultsSet(wc, server);
- ILaunchConfigurationTab[] tabs = getTabs();
- for (int i = 0; i < tabs.length; i++) {
- try {
- tabs[i].initializeFrom(wc);
- } catch( Exception e ) {
- e.printStackTrace();
- }
- }
- } catch(Exception e) {
- }
- }
-
-
- protected class JBossJavaArgumentsTab extends JavaArgumentsTab {
- public static final int START = 0;
- public static final int STOP = 1;
- public static final int TWIDDLE = 2;
-
-
-
- private int type;
- private String suffix;
- protected String programArgsKey;
- protected String vmArgsKey;
- protected String workingDirKey;
-
- public JBossJavaArgumentsTab(int type) {
- super();
- this.type = type;
- if( this.type == START ) suffix = JBossServerLaunchConfiguration.PRGM_ARGS_START_SUFFIX;
- if( this.type == STOP ) suffix = JBossServerLaunchConfiguration.PRGM_ARGS_STOP_SUFFIX;
- if( this.type == TWIDDLE ) suffix = JBossServerLaunchConfiguration.PRGM_ARGS_TWIDDLE_SUFFIX;
-
- programArgsKey = IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS + suffix;
- vmArgsKey = IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS + suffix;
- workingDirKey = IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY + suffix;
- }
-
- public void setDefaults(ILaunchConfigurationWorkingCopy config) {
- config.setAttribute(programArgsKey, (String)null);
- fVMArgumentsBlock.setDefaults(config);
- fWorkingDirectoryBlock.setDefaults(config);
- }
-
- protected VMArgumentsBlock createVMArgsBlock() {
- return new JBossVMArgumentsBlock();
- }
-
- protected WorkingDirectoryBlock createWorkingDirBlock() {
- return new JBossWorkingDirectoryBlock();
- }
-
- public String getName() {
- switch (type) {
- case START: return "Start Args"; //Messages.LaunchGroupStartArgs;
- case STOP: return "Stop Args"; //Messages.LaunchGroupTwiddleArgs;
- case TWIDDLE: return "Twiddle Args"; //Messages.LaunchGroupStopArgs;
- default:
- return super.getName();
- }
- }
-
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
- */
- public void initializeFrom(ILaunchConfiguration configuration) {
- try {
- String prgmArgs = configuration.getAttribute(programArgsKey, (String)null);
- fPrgmArgumentsText.setText(prgmArgs);
- fVMArgumentsBlock.initializeFrom(configuration);
- fWorkingDirectoryBlock.initializeFrom(configuration);
- } catch (CoreException e) {
- setErrorMessage(LauncherMessages.JavaArgumentsTab_Exception_occurred_reading_configuration___15 + e.getStatus().getMessage());
- JDIDebugUIPlugin.log(e);
- }
- }
-
- /**
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
- */
- public void performApply(ILaunchConfigurationWorkingCopy configuration) {
- configuration.setAttribute(programArgsKey, getAttributeValueFrom(fPrgmArgumentsText));
- fVMArgumentsBlock.performApply(configuration);
- fWorkingDirectoryBlock.performApply(configuration);
- }
-
- protected class JBossVMArgumentsBlock extends VMArgumentsBlock {
- public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
- configuration.setAttribute(vmArgsKey, (String)null);
- }
-
- public void initializeFrom(ILaunchConfiguration configuration) {
- try {
- fVMArgumentsText.setText(configuration.getAttribute(vmArgsKey, "")); //$NON-NLS-1$
- } catch (CoreException e) {
- setErrorMessage(LauncherMessages.JavaArgumentsTab_Exception_occurred_reading_configuration___15 + e.getStatus().getMessage());
- JDIDebugUIPlugin.log(e);
- }
- }
-
- public void performApply(ILaunchConfigurationWorkingCopy configuration) {
- configuration.setAttribute(vmArgsKey, getAttributeValueFrom(fVMArgumentsText));
- }
- }
-
-
- /* 100% lifted from jdt because they didnt make anything PROTECTED! >:O */
- public class JBossWorkingDirectoryBlock extends WorkingDirectoryBlock {
-
- // Local directory
- private Button fWorkspaceButton;
- private Button fFileSystemButton;
- private Button fVariablesButton;
-
- //bug 29565 fix
- private Button fUseDefaultDirButton = null;
- private Button fUseOtherDirButton = null;
- private Text fOtherWorkingText = null;
- private Text fWorkingDirText;
-
- /**
- * The last launch config this tab was initialized from
- */
- private ILaunchConfiguration fLaunchConfiguration;
-
- /**
- * A listener to update for text changes and widget selection
- */
- private class WidgetListener extends SelectionAdapter implements ModifyListener {
- public void modifyText(ModifyEvent e) {
- updateLaunchConfigurationDialog();
- }//end modifyText
- public void widgetSelected(SelectionEvent e) {
- Object source= e.getSource();
- if (source == fWorkspaceButton) {
- handleWorkspaceDirBrowseButtonSelected();
- }//end if
- else if (source == fFileSystemButton) {
- handleWorkingDirBrowseButtonSelected();
- }//end if
- else if (source == fVariablesButton) {
- handleWorkingDirVariablesButtonSelected();
- }//end if
- else if(source == fUseDefaultDirButton) {
- //only perform the action if this is the button that was selected
- if(fUseDefaultDirButton.getSelection()) {
- setDefaultWorkingDir();
- }//end if
- }//end if
- else if(source == fUseOtherDirButton) {
- //only perform the action if this is the button that was selected
- if(fUseOtherDirButton.getSelection()) {
- handleUseOtherWorkingDirButtonSelected();
- }//end if
- }//end if
- }//end widgetSelected
- }//end WidgetListener class
-
- private WidgetListener fListener = new WidgetListener();
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
- Font font = parent.getFont();
-
- Group group = new Group(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJavaDebugHelpContextIds.WORKING_DIRECTORY_BLOCK);
- GridLayout workingDirLayout = new GridLayout();
- workingDirLayout.numColumns = 2;
- workingDirLayout.makeColumnsEqualWidth = false;
- group.setLayout(workingDirLayout);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- group.setLayoutData(gd);
- group.setFont(font);
- setControl(group);
-
- group.setText(LauncherMessages.WorkingDirectoryBlock_12);
-
- fUseDefaultDirButton = new Button(group, SWT.RADIO);
- fUseDefaultDirButton.setText(LauncherMessages.WorkingDirectoryBlock_18);
- fUseDefaultDirButton.setFont(font);
- fUseDefaultDirButton.addSelectionListener(fListener);
- fWorkingDirText = new Text(group, SWT.SINGLE | SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- fWorkingDirText.setLayoutData(gd);
- fWorkingDirText.setFont(font);
- fWorkingDirText.addModifyListener(fListener);
- fWorkingDirText.setEnabled(false);
-
- fUseOtherDirButton = new Button(group, SWT.RADIO);
- fUseOtherDirButton.setText(LauncherMessages.WorkingDirectoryBlock_19);
- fUseOtherDirButton.setFont(font);
- fUseOtherDirButton.addSelectionListener(fListener);
- fOtherWorkingText = new Text(group, SWT.SINGLE | SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- fOtherWorkingText.setLayoutData(gd);
- fOtherWorkingText.setFont(font);
- fOtherWorkingText.addModifyListener(fListener);
-
- Composite buttonComp = new Composite(group, SWT.NONE);
- GridLayout layout = new GridLayout(3, false);
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- buttonComp.setLayout(layout);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
- gd.horizontalSpan = 2;
- buttonComp.setLayoutData(gd);
- buttonComp.setFont(font);
- fWorkspaceButton = createPushButton(buttonComp, LauncherMessages.WorkingDirectoryBlock_0, null);
- fWorkspaceButton.addSelectionListener(fListener);
-
- fFileSystemButton = createPushButton(buttonComp, LauncherMessages.WorkingDirectoryBlock_1, null);
- fFileSystemButton.addSelectionListener(fListener);
-
- fVariablesButton = createPushButton(buttonComp, LauncherMessages.WorkingDirectoryBlock_17, null);
- fVariablesButton.addSelectionListener(fListener);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose()
- */
- public void dispose() {}
-
- /**
- * Show a dialog that lets the user select a working directory
- */
- private void handleWorkingDirBrowseButtonSelected() {
- DirectoryDialog dialog = new DirectoryDialog(getShell());
- dialog.setMessage(LauncherMessages.WorkingDirectoryBlock_7);
- String currentWorkingDir = getWorkingDirectoryText();
- if (!currentWorkingDir.trim().equals("")) { //$NON-NLS-1$
- File path = new File(currentWorkingDir);
- if (path.exists()) {
- dialog.setFilterPath(currentWorkingDir);
- }//end if
- }//end if
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null) {
- fOtherWorkingText.setText(selectedDirectory);
- }//end if
- }//end handleQWrokingDirBrowseBUttonSelected
-
- /**
- * Show a dialog that lets the user select a working directory from
- * the workspace
- */
- private void handleWorkspaceDirBrowseButtonSelected() {
- IContainer currentContainer= getContainer();
- if (currentContainer == null) {
- currentContainer = ResourcesPlugin.getWorkspace().getRoot();
- }//end if
- ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(), currentContainer, false, LauncherMessages.WorkingDirectoryBlock_4);
- dialog.showClosedProjects(false);
- dialog.open();
- Object[] results = dialog.getResult();
- if ((results != null) && (results.length > 0) && (results[0] instanceof IPath)) {
- IPath path = (IPath)results[0];
- String containerName = path.makeRelative().toString();
- setOtherWorkingDirectoryText("${workspace_loc:" + containerName + "}"); //$NON-NLS-1$ //$NON-NLS-2$
- }//end if
- }//end handleWorkspaceDirBrowseButtonSelected
-
- /**
- * Returns the selected workspace container,or <code>null</code>
- */
- protected IContainer getContainer() {
- String path = getWorkingDirectoryText();
- if (path.length() > 0) {
- IResource res = null;
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- if (path.startsWith("${workspace_loc:")) { //$NON-NLS-1$
- IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
- try {
- path = manager.performStringSubstitution(path, false);
- IContainer[] containers = root.findContainersForLocation(new Path(path));
- if (containers.length > 0) {
- res = containers[0];
- }//end if
- }//end try
- catch (CoreException e) {}
- }//end if
- else {
- res = root.findMember(path);
- }//end else
- if (res instanceof IContainer) {
- return (IContainer)res;
- }//end if
- }//end if
- return null;
- }//end getContainer
-
- /**
- * The default working dir radio button has been selected.
- */
- private void handleUseDefaultWorkingDirButtonSelected() {
- fWorkspaceButton.setEnabled(false);
- fOtherWorkingText.setEnabled(false);
- fVariablesButton.setEnabled(false);
- fFileSystemButton.setEnabled(false);
- fUseOtherDirButton.setSelection(false);
- }
-
- /**
- * The other working dir radio button has been selected
- *
- * @since 3.2
- */
- private void handleUseOtherWorkingDirButtonSelected() {
- fOtherWorkingText.setEnabled(true);
- fWorkspaceButton.setEnabled(true);
- fVariablesButton.setEnabled(true);
- fFileSystemButton.setEnabled(true);
- updateLaunchConfigurationDialog();
- }
-
- /**
- * The working dir variables button has been selected
- */
- private void handleWorkingDirVariablesButtonSelected() {
- StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell());
- dialog.open();
- String variableText = dialog.getVariableExpression();
- if (variableText != null) {
- fOtherWorkingText.insert(variableText);
- }//end if
- }//end handleWorkingDirVariablesButtonSelected
-
- /**
- * Sets the default working directory
- */
- protected void setDefaultWorkingDir() {
- try {
- ILaunchConfiguration config = getLaunchConfiguration();
- if (config != null) {
- IJavaProject javaProject = JavaRuntime.getJavaProject(config);
- if (javaProject != null) {
- setDefaultWorkingDirectoryText("${workspace_loc:" + javaProject.getPath().makeRelative().toOSString() + "}"); //$NON-NLS-1$//$NON-NLS-2$
- return;
- }//end if
- }//end if
- }//end try
- catch (CoreException ce) {}
- setDefaultWorkingDirectoryText(System.getProperty("user.dir")); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
- */
- public boolean isValid(ILaunchConfiguration config) {
- setErrorMessage(null);
- setMessage(null);
- // if variables are present, we cannot resolve the directory
- String workingDirPath = getWorkingDirectoryText();
- if (workingDirPath.indexOf("${") >= 0) { //$NON-NLS-1$
- IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
- try {
- manager.validateStringVariables(workingDirPath);
- }//end try
- catch (CoreException e) {
- setErrorMessage(e.getMessage());
- return false;
- }//end catch
- }//end if
- else if (workingDirPath.length() > 0) {
- IContainer container = getContainer();
- if (container == null) {
- File dir = new File(workingDirPath);
- if (dir.isDirectory()) {
- return true;
- }//end if
- setErrorMessage(LauncherMessages.WorkingDirectoryBlock_10);
- return false;
- }//end if
- } else if (workingDirPath.length() == 0) {
- setErrorMessage(LauncherMessages.WorkingDirectoryBlock_20);
- }
- return true;
- }//end isValid
-
- /**
- * Defaults are empty.
- *
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
- */
- public void setDefaults(ILaunchConfigurationWorkingCopy config) {
- config.setAttribute(workingDirKey, (String)null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
- */
- public void initializeFrom(ILaunchConfiguration configuration) {
- setLaunchConfiguration(configuration);
- try {
- String wd = configuration.getAttribute(workingDirKey, (String)null);
- setDefaultWorkingDir();
- if (wd != null) {
- setOtherWorkingDirectoryText(wd);
- }//end else
- }//end try
- catch (CoreException e) {
- setErrorMessage(LauncherMessages.JavaArgumentsTab_Exception_occurred_reading_configuration___15 + e.getStatus().getMessage());
- JDIDebugUIPlugin.log(e);
- }//end catch
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
- */
- public void performApply(ILaunchConfigurationWorkingCopy configuration) {
- if(fUseDefaultDirButton.getSelection()) {
- configuration.setAttribute(workingDirKey, (String)null);
- }//end if
- else {
- configuration.setAttribute(workingDirKey, getWorkingDirectoryText());
- }//end else
- }//end performApply
-
- /* (non-Javadoc)
- * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
- */
- public String getName() {
- return LauncherMessages.WorkingDirectoryBlock_Working_Directory_8;
- }//end getName
-
- /**
- * gets the path from the text box that is selected
- * @return the working directory the user wishes to use
- * @since 3.2
- */
- protected String getWorkingDirectoryText() {
- if(fUseDefaultDirButton.getSelection()) {
- return fWorkingDirText.getText().trim();
- }//end if
- return fOtherWorkingText.getText().trim();
- }//end getWorkingDirectoryPath
-
- /**
- * sets the default working directory text
- * @param dir the dir to set the widget to
- * @since 3.2
- */
- protected void setDefaultWorkingDirectoryText(String dir) {
- if(dir != null) {
- fWorkingDirText.setText(dir);
- fUseDefaultDirButton.setSelection(true);
- handleUseDefaultWorkingDirButtonSelected();
- }//end if
- }//setDefaultWorkingDirectoryText
-
- /**
- * sets the other dir text
- * @param dir the new text
- * @since 3.2
- */
- protected void setOtherWorkingDirectoryText(String dir) {
- if(dir != null) {
- fOtherWorkingText.setText(dir);
- fUseDefaultDirButton.setSelection(false);
- fUseOtherDirButton.setSelection(true);
- handleUseOtherWorkingDirButtonSelected();
- }//end if
- }//end setOtherWorkingDirectoryText
-
- /**
- * Sets the java project currently specified by the
- * given launch config, if any.
- */
- protected void setLaunchConfiguration(ILaunchConfiguration config) {
- fLaunchConfiguration = config;
- }
-
- /**
- * Returns the current java project context
- */
- protected ILaunchConfiguration getLaunchConfiguration() {
- return fLaunchConfiguration;
- }
-
- /**
- * Allows this entire block to be enabled/disabled
- * @param enabled whether to enable it or not
- */
- protected void setEnabled(boolean enabled) {
- fUseDefaultDirButton.setEnabled(enabled);
- fUseOtherDirButton.setEnabled(enabled);
- if(fOtherWorkingText.isEnabled()) {
- fOtherWorkingText.setEnabled(enabled);
- fWorkspaceButton.setEnabled(enabled);
- fVariablesButton.setEnabled(enabled);
- fFileSystemButton.setEnabled(enabled);
- }//end if
- // in the case where the 'other' text is selected and we want to enable
- if(fUseOtherDirButton.getSelection() && enabled == true) {
- fOtherWorkingText.setEnabled(enabled);
- }//end if
- }//end setEnabled
-
- }//end class
-
- }
-
-
- public class JBossJavaClasspathTab extends JavaClasspathTab {
- public boolean isValid(ILaunchConfiguration launchConfig) {
- if( getModel() != null )
- return super.isValid(launchConfig);
- return false;
- }
- }
-
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/upgrades/UpdatePage20.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/upgrades/UpdatePage20.java 2007-09-05 18:12:31 UTC (rev 3465)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/upgrades/UpdatePage20.java 2007-09-06 04:52:32 UTC (rev 3466)
@@ -21,406 +21,403 @@
*/
package org.jboss.ide.eclipse.as.ui.upgrades;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.jboss.ide.eclipse.as.core.util.ASLaunchConfigurationConverter;
-import org.jboss.ide.eclipse.as.core.util.ASLaunchConfigurationConverter.TempLaunchConfiguration;
-import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.firstrun.wizard.pages.AbstractFirstRunPage;
public class UpdatePage20 extends AbstractFirstRunPage {
- private ASLaunchConfigurationConverter converter;
- private TempLaunchConfiguration[] configs;
-
- private ArrayList rows;
- private boolean pageComplete;
- private String errorMessage;
-
- private Label descLabel;
-
- private ConfigDataComposite configDataComposite;
-
-
- public UpdatePage20() {
- super("", Messages.UpgradeWizardTitle, null);
- rows = new ArrayList();
+ protected UpdatePage20(String pageName, String title,
+ ImageDescriptor titleImage) {
+ super(pageName, title, titleImage);
+ // TODO Auto-generated constructor stub
}
+ @Override
public void createControl(Composite parent) {
- Composite main = new Composite(parent, SWT.NONE);
- main.setLayout(new FormLayout());
+ // TODO Auto-generated method stub
- Composite main2 = new Composite(main, SWT.NONE);
- FormData main2Data = new FormData();
- main2Data.left = new FormAttachment(0,5);
- main2Data.right = new FormAttachment(100,-5);
- main2Data.top = new FormAttachment(0,5);
- main2Data.bottom = new FormAttachment(100,-5);
- main2.setLayoutData(main2Data);
-
- main2.setLayout(new FormLayout());
-
- descLabel = new Label(main2, SWT.NONE);
- FormData descLabelData = new FormData();
- descLabelData.left = new FormAttachment(0,5);
- descLabelData.right = new FormAttachment(100,-5);
- descLabelData.top = new FormAttachment(0,5);
- descLabel.setLayoutData(descLabelData);
-
- descLabel.setText(Messages.UpgradeWizardDescription);
-
- if( configs.length != 0 ) {
- createFullControl(main2);
- } else {
- createEmptyControl(main2);
- }
- setControl(main);
}
-
- protected void createEmptyControl(Composite main2) {
- Label noConfigsLabel = new Label(main2, SWT.NONE);
- FormData noConfigsData = new FormData();
- noConfigsData.left = new FormAttachment(0,5);
- noConfigsData.right = new FormAttachment(100,-5);
- noConfigsData.top = new FormAttachment(descLabel,8);
- noConfigsLabel.setLayoutData(noConfigsData);
-
- noConfigsLabel.setText(Messages.UpgradeWizardNoConvertableConfigs);
-
- pageComplete = true;
- }
-
- protected void createFullControl(Composite main2) {
- ScrolledComposite sc = new ScrolledComposite(main2, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- FormData scData = new FormData();
- scData.left = new FormAttachment(0,5);
- scData.right = new FormAttachment(100,-5);
- scData.top = new FormAttachment(descLabel,5);
- scData.bottom = new FormAttachment(50,-2);
- sc.setLayoutData(scData);
-
- fillScrolledComposite(sc);
-
-
- configDataComposite = new ConfigDataComposite(main2, SWT.NONE);
- FormData cdcData = new FormData();
- cdcData.left = new FormAttachment(0,5);
- cdcData.right = new FormAttachment(100,-5);
- cdcData.top = new FormAttachment(sc,5);
- cdcData.bottom = new FormAttachment(100,-5);
- configDataComposite.setLayoutData(cdcData);
- checkPageComplete();
- }
-
- protected class ConfigDataComposite extends Composite {
- private TempLaunchConfiguration currentConfig;
-
- private Label launchConfigName, homeDir, jbConfig, startArgs, stopArgs, jre;
-
- public ConfigDataComposite(Composite parent, int style) {
- super(parent, style);
-
- setLayout(new FormLayout());
-
-
- Label detailLabel = new Label(this, SWT.NONE);
- FormData dld = new FormData();
- dld.left = new FormAttachment(0,5);
- dld.top = new FormAttachment(0,5);
- detailLabel.setLayoutData(dld);
- detailLabel.setText(Messages.UpgradeWizardDetails);
-
- Composite detailComposite = new Composite(this, SWT.NONE);
- detailComposite.setLayout(new GridLayout(2, false));
- FormData detailCompositeData = new FormData();
- detailCompositeData.left = new FormAttachment(0,20);
- detailCompositeData.top = new FormAttachment(detailLabel, 5);
- detailComposite.setLayoutData(detailCompositeData);
-
-
-
- new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchConfigName);
- launchConfigName = new Label(detailComposite, SWT.NONE);
-
- new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchHomeDir);
- homeDir = new Label(detailComposite, SWT.NONE);
-
- new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchJBossConfig);
- jbConfig = new Label(detailComposite, SWT.NONE);
-
- new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchStartArgs);
- startArgs = new Label(detailComposite, SWT.NONE);
-
- new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchShutdownArgs);
- stopArgs = new Label(detailComposite, SWT.NONE);
-
- new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchJRE);
- jre = new Label(detailComposite, SWT.NONE);
- }
-
- public void setInput(TempLaunchConfiguration config) {
- if( config != currentConfig) {
- currentConfig = config;
- try {
- launchConfigName.setText(config.getName());
- homeDir.setText(config.getAttribute("org.jboss.rocklet.HomeDir", ""));
- jbConfig.setText(config.getAttribute("org.jboss.rocklet.ServerConfiguration", ""));
- startArgs.setText(config.getAttribute("org.rocklet.launcher.userProgramArgs", ""));
- stopArgs.setText(config.getAttribute("org.rocklet.launcher.userShutdownProgramArgs", ""));
- IVMInstall vm = config.getJVMItem();
- String vmName = vm == null ? "" : vm.getName();
- jre.setText(vmName);
- layout();
- } catch( CoreException ce ) {
- ce.printStackTrace();
- }
- }
- }
- }
-
- protected void fillScrolledComposite(ScrolledComposite sc) {
-
- Composite main = new Composite(sc, SWT.NONE);
- main.setLayout(new GridLayout(4, false));
- sc.setContent(main);
+ @Override
+ public void initialize() {
+ // TODO Auto-generated method stub
-
-
- // add headings
- Label convertLabel = new Label(main, SWT.NONE);
- convertLabel.setText(Messages.UpgradeWizardLaunchConvert);
- Label configName = new Label(main, SWT.NONE);
- configName.setText(Messages.UpgradeWizardLaunchConfigName2);
- Label runtimeLabel = new Label(main, SWT.NONE);
- runtimeLabel.setText(Messages.UpgradeWizardLaunchRuntimeName);
- Label serverLabel = new Label(main, SWT.NONE);
- serverLabel.setText(Messages.UpgradeWizardLaunchServerName);
-
- for( int i = 0; i < configs.length; i++ ) {
- // should add the 4 widgets itself
- ConfigurationRow row = new ConfigurationRow(configs[i], main);
- rows.add(row);
- }
-
-
- // force a layout
- main.pack();
-
- int locY = main.getLocation().y;
- int locX = main.getLocation().x;
- int sY = main.getSize().y;
- int sX = main.getSize().x;
-
-
- sc.setExpandHorizontal(true);
- sc.setExpandVertical(true);
- sc.setMinHeight(locY + sY);
- sc.setMinWidth(locX + sX);
-
- sc.setSize(300,150);
}
-
- public void initialize() {
- converter = new ASLaunchConfigurationConverter();
- configs = converter.getConvertableConfigurations();
- }
-
+ @Override
public void performFinishWithProgress(IProgressMonitor monitor) {
- monitor.beginTask(Messages.UpgradeWizardLaunchMonitorMainTask, rows.size() * 100);
- monitor.setTaskName(Messages.UpgradeWizardLaunchMonitorMainTask);
- Iterator i = rows.iterator();
- while(i.hasNext()) {
- ConfigurationRow r = (ConfigurationRow)i.next();
- if( r.getSelected() ) {
- // now convert
- monitor.subTask(Messages.UpgradeWizardLaunchMonitorConverting + r.getLaunchConfig().getName());
- try {
- converter.convertConfiguration(r.getLaunchConfig(),
- r.getRuntimeName(), r.getServerName());
- } catch( CoreException ce ) {
- ce.printStackTrace();
- }
- }
- }
- monitor.done();
- }
-
- public boolean isPageComplete() {
- return pageComplete;
- }
-
- protected void checkPageComplete() {
- pageComplete = true; // start it off true. If it remains true, great
- HashMap map = new HashMap();
-
-
-
- String server_prefix = "__SP__";
- String rt_prefix = "__RT__";
-
- IRuntime[] rts = ServerCore.getRuntimes();
- IServer[] servers = ServerCore.getServers();
-
- for( int i = 0; i < rts.length; i++ ) {
- map.put(rt_prefix + rts[i].getName(), "");
- }
- for( int i = 0; i < servers.length; i++ ) {
- map.put(server_prefix + servers[i].getName(), "");
- }
-
- ArrayList runtimeCollisions = new ArrayList();
- ArrayList serverCollisions = new ArrayList();
-
- Iterator i = rows.iterator();
- while(i.hasNext()) {
- ConfigurationRow r = (ConfigurationRow)i.next();
- if( r.getSelected()) {
- if( !map.containsKey(rt_prefix + r.getRuntimeName())
- && !map.containsKey(server_prefix + r.getServerName())) {
- map.put(rt_prefix + r.getRuntimeName(), "");
- map.put(server_prefix + r.getServerName(), "");
- } else {
- if( map.containsKey(rt_prefix + r.getRuntimeName()))
- runtimeCollisions.add(r.getRuntimeName());
- if( map.containsKey(server_prefix + r.getServerName()))
- serverCollisions.add(r.getServerName());
-
- pageComplete = false;
- }
- }
- }
-
- if( runtimeCollisions.size() == 0 && serverCollisions.size() == 0 ) {
- errorMessage = null;
- } else {
- errorMessage = "";
- String[] sc = (String[]) serverCollisions.toArray(new String[serverCollisions.size()]);
- String[] rtc = (String[]) runtimeCollisions.toArray(new String[runtimeCollisions.size()]);
- if( rtc.length > 0 )
- errorMessage += Messages.UpgradeWizardLaunchRuntimeNamesInUse + implode(rtc, ", ") + "\n";
- if( sc.length > 0 )
- errorMessage += Messages.UpgradeWizardLaunchServerNamesInUse + implode(sc, ", ");
- }
- setErrorMessage(errorMessage);
- }
-
- protected String implode(String[] array, String separator) {
- if( array.length == 0 ) return "";
- String ret = "";
- for( int i = 0; i < array.length; i++ ) {
- ret += array[i] + separator;
- }
- return ret.substring(0, ret.length() - separator.length());
- }
-
- protected class ConfigurationRow {
- private TempLaunchConfiguration config;
+ // TODO Auto-generated method stub
- private Button shouldConvert;
- private Label nameLabel;
- private Text runtimeText;
- private Text serverText;
-
- public ConfigurationRow(TempLaunchConfiguration config, Composite parent) {
- this.config = config;
-
- shouldConvert = new Button(parent, SWT.CHECK);
- shouldConvert.setSelection(true);
- GridData shouldConvertData = new GridData(GridData.HORIZONTAL_ALIGN_CENTER);
- shouldConvert.setLayoutData(shouldConvertData);
-
- nameLabel = new Label(parent, SWT.NONE);
- nameLabel.setText(config.getName());
-
- runtimeText = new Text(parent, SWT.BORDER);
- runtimeText.setText(config.getName() + " Runtime");
-
- GridData rtgd = new GridData(GridData.FILL_HORIZONTAL);
- runtimeText.setLayoutData(rtgd);
-
- serverText = new Text(parent, SWT.BORDER);
- serverText.setText(config.getName());
- GridData stgd = new GridData(GridData.FILL_HORIZONTAL);
- serverText.setLayoutData(stgd);
-
-
-
- // listeners
- SelectionListener listener = new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- checkPageComplete();
- getContainer().updateButtons();
- }
- };
- ModifyListener modListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- checkPageComplete();
- getContainer().updateButtons();
- }
- };
- shouldConvert.addSelectionListener(listener);
- runtimeText.addModifyListener(modListener);
- serverText.addModifyListener(modListener);
-
- final TempLaunchConfiguration config2 = config;
- Listener mmListener = new Listener() {
- public void handleEvent(Event event) {
- if( event.type == SWT.MouseMove) {
- configDataComposite.setInput(config2);
- }
- }
- };
- shouldConvert.addListener(SWT.MouseMove, mmListener);
- runtimeText.addListener(SWT.MouseMove, mmListener);
- serverText.addListener(SWT.MouseMove, mmListener);
- nameLabel.addListener(SWT.MouseMove, mmListener);
- }
-
- public boolean getSelected() {
- return shouldConvert.getSelection();
- }
- public String getName() {
- return nameLabel.getText();
- }
- public String getRuntimeName() {
- return runtimeText.getText();
- }
- public String getServerName() {
- return serverText.getText();
- }
- public TempLaunchConfiguration getLaunchConfig() {
- return config;
- }
}
+
+// private ASLaunchConfigurationConverter converter;
+// private TempLaunchConfiguration[] configs;
+//
+// private ArrayList rows;
+// private boolean pageComplete;
+// private String errorMessage;
+//
+// private Label descLabel;
+//
+// private ConfigDataComposite configDataComposite;
+//
+//
+// public UpdatePage20() {
+// super("", Messages.UpgradeWizardTitle, null);
+// rows = new ArrayList();
+// }
+//
+// public void createControl(Composite parent) {
+// Composite main = new Composite(parent, SWT.NONE);
+// main.setLayout(new FormLayout());
+//
+// Composite main2 = new Composite(main, SWT.NONE);
+// FormData main2Data = new FormData();
+// main2Data.left = new FormAttachment(0,5);
+// main2Data.right = new FormAttachment(100,-5);
+// main2Data.top = new FormAttachment(0,5);
+// main2Data.bottom = new FormAttachment(100,-5);
+// main2.setLayoutData(main2Data);
+//
+// main2.setLayout(new FormLayout());
+//
+// descLabel = new Label(main2, SWT.NONE);
+// FormData descLabelData = new FormData();
+// descLabelData.left = new FormAttachment(0,5);
+// descLabelData.right = new FormAttachment(100,-5);
+// descLabelData.top = new FormAttachment(0,5);
+// descLabel.setLayoutData(descLabelData);
+//
+// descLabel.setText(Messages.UpgradeWizardDescription);
+//
+// if( configs.length != 0 ) {
+// createFullControl(main2);
+// } else {
+// createEmptyControl(main2);
+// }
+// setControl(main);
+// }
+//
+// protected void createEmptyControl(Composite main2) {
+// Label noConfigsLabel = new Label(main2, SWT.NONE);
+// FormData noConfigsData = new FormData();
+// noConfigsData.left = new FormAttachment(0,5);
+// noConfigsData.right = new FormAttachment(100,-5);
+// noConfigsData.top = new FormAttachment(descLabel,8);
+// noConfigsLabel.setLayoutData(noConfigsData);
+//
+// noConfigsLabel.setText(Messages.UpgradeWizardNoConvertableConfigs);
+//
+// pageComplete = true;
+// }
+//
+// protected void createFullControl(Composite main2) {
+// ScrolledComposite sc = new ScrolledComposite(main2, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+// FormData scData = new FormData();
+// scData.left = new FormAttachment(0,5);
+// scData.right = new FormAttachment(100,-5);
+// scData.top = new FormAttachment(descLabel,5);
+// scData.bottom = new FormAttachment(50,-2);
+// sc.setLayoutData(scData);
+//
+// fillScrolledComposite(sc);
+//
+//
+// configDataComposite = new ConfigDataComposite(main2, SWT.NONE);
+// FormData cdcData = new FormData();
+// cdcData.left = new FormAttachment(0,5);
+// cdcData.right = new FormAttachment(100,-5);
+// cdcData.top = new FormAttachment(sc,5);
+// cdcData.bottom = new FormAttachment(100,-5);
+// configDataComposite.setLayoutData(cdcData);
+// checkPageComplete();
+// }
+//
+// protected class ConfigDataComposite extends Composite {
+// private TempLaunchConfiguration currentConfig;
+//
+// private Label launchConfigName, homeDir, jbConfig, startArgs, stopArgs, jre;
+//
+// public ConfigDataComposite(Composite parent, int style) {
+// super(parent, style);
+//
+// setLayout(new FormLayout());
+//
+//
+// Label detailLabel = new Label(this, SWT.NONE);
+// FormData dld = new FormData();
+// dld.left = new FormAttachment(0,5);
+// dld.top = new FormAttachment(0,5);
+// detailLabel.setLayoutData(dld);
+// detailLabel.setText(Messages.UpgradeWizardDetails);
+//
+// Composite detailComposite = new Composite(this, SWT.NONE);
+// detailComposite.setLayout(new GridLayout(2, false));
+// FormData detailCompositeData = new FormData();
+// detailCompositeData.left = new FormAttachment(0,20);
+// detailCompositeData.top = new FormAttachment(detailLabel, 5);
+// detailComposite.setLayoutData(detailCompositeData);
+//
+//
+//
+// new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchConfigName);
+// launchConfigName = new Label(detailComposite, SWT.NONE);
+//
+// new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchHomeDir);
+// homeDir = new Label(detailComposite, SWT.NONE);
+//
+// new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchJBossConfig);
+// jbConfig = new Label(detailComposite, SWT.NONE);
+//
+// new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchStartArgs);
+// startArgs = new Label(detailComposite, SWT.NONE);
+//
+// new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchShutdownArgs);
+// stopArgs = new Label(detailComposite, SWT.NONE);
+//
+// new Label(detailComposite, SWT.NONE).setText(Messages.UpgradeWizardLaunchJRE);
+// jre = new Label(detailComposite, SWT.NONE);
+// }
+//
+// public void setInput(TempLaunchConfiguration config) {
+// if( config != currentConfig) {
+// currentConfig = config;
+// try {
+// launchConfigName.setText(config.getName());
+// homeDir.setText(config.getAttribute("org.jboss.rocklet.HomeDir", ""));
+// jbConfig.setText(config.getAttribute("org.jboss.rocklet.ServerConfiguration", ""));
+// startArgs.setText(config.getAttribute("org.rocklet.launcher.userProgramArgs", ""));
+// stopArgs.setText(config.getAttribute("org.rocklet.launcher.userShutdownProgramArgs", ""));
+//
+// IVMInstall vm = config.getJVMItem();
+// String vmName = vm == null ? "" : vm.getName();
+// jre.setText(vmName);
+// layout();
+// } catch( CoreException ce ) {
+// ce.printStackTrace();
+// }
+// }
+// }
+// }
+//
+// protected void fillScrolledComposite(ScrolledComposite sc) {
+//
+// Composite main = new Composite(sc, SWT.NONE);
+// main.setLayout(new GridLayout(4, false));
+// sc.setContent(main);
+//
+//
+//
+// // add headings
+// Label convertLabel = new Label(main, SWT.NONE);
+// convertLabel.setText(Messages.UpgradeWizardLaunchConvert);
+// Label configName = new Label(main, SWT.NONE);
+// configName.setText(Messages.UpgradeWizardLaunchConfigName2);
+// Label runtimeLabel = new Label(main, SWT.NONE);
+// runtimeLabel.setText(Messages.UpgradeWizardLaunchRuntimeName);
+// Label serverLabel = new Label(main, SWT.NONE);
+// serverLabel.setText(Messages.UpgradeWizardLaunchServerName);
+//
+// for( int i = 0; i < configs.length; i++ ) {
+// // should add the 4 widgets itself
+// ConfigurationRow row = new ConfigurationRow(configs[i], main);
+// rows.add(row);
+// }
+//
+//
+// // force a layout
+// main.pack();
+//
+// int locY = main.getLocation().y;
+// int locX = main.getLocation().x;
+// int sY = main.getSize().y;
+// int sX = main.getSize().x;
+//
+//
+// sc.setExpandHorizontal(true);
+// sc.setExpandVertical(true);
+// sc.setMinHeight(locY + sY);
+// sc.setMinWidth(locX + sX);
+//
+// sc.setSize(300,150);
+// }
+//
+//
+// public void initialize() {
+// converter = new ASLaunchConfigurationConverter();
+// configs = converter.getConvertableConfigurations();
+// }
+//
+// public void performFinishWithProgress(IProgressMonitor monitor) {
+// monitor.beginTask(Messages.UpgradeWizardLaunchMonitorMainTask, rows.size() * 100);
+// monitor.setTaskName(Messages.UpgradeWizardLaunchMonitorMainTask);
+// Iterator i = rows.iterator();
+// while(i.hasNext()) {
+// ConfigurationRow r = (ConfigurationRow)i.next();
+// if( r.getSelected() ) {
+// // now convert
+// monitor.subTask(Messages.UpgradeWizardLaunchMonitorConverting + r.getLaunchConfig().getName());
+// try {
+// converter.convertConfiguration(r.getLaunchConfig(),
+// r.getRuntimeName(), r.getServerName());
+// } catch( CoreException ce ) {
+// ce.printStackTrace();
+// }
+// }
+// }
+// monitor.done();
+// }
+//
+// public boolean isPageComplete() {
+// return pageComplete;
+// }
+//
+// protected void checkPageComplete() {
+// pageComplete = true; // start it off true. If it remains true, great
+// HashMap map = new HashMap();
+//
+//
+//
+// String server_prefix = "__SP__";
+// String rt_prefix = "__RT__";
+//
+// IRuntime[] rts = ServerCore.getRuntimes();
+// IServer[] servers = ServerCore.getServers();
+//
+// for( int i = 0; i < rts.length; i++ ) {
+// map.put(rt_prefix + rts[i].getName(), "");
+// }
+// for( int i = 0; i < servers.length; i++ ) {
+// map.put(server_prefix + servers[i].getName(), "");
+// }
+//
+// ArrayList runtimeCollisions = new ArrayList();
+// ArrayList serverCollisions = new ArrayList();
+//
+// Iterator i = rows.iterator();
+// while(i.hasNext()) {
+// ConfigurationRow r = (ConfigurationRow)i.next();
+// if( r.getSelected()) {
+// if( !map.containsKey(rt_prefix + r.getRuntimeName())
+// && !map.containsKey(server_prefix + r.getServerName())) {
+// map.put(rt_prefix + r.getRuntimeName(), "");
+// map.put(server_prefix + r.getServerName(), "");
+// } else {
+// if( map.containsKey(rt_prefix + r.getRuntimeName()))
+// runtimeCollisions.add(r.getRuntimeName());
+// if( map.containsKey(server_prefix + r.getServerName()))
+// serverCollisions.add(r.getServerName());
+//
+// pageComplete = false;
+// }
+// }
+// }
+//
+// if( runtimeCollisions.size() == 0 && serverCollisions.size() == 0 ) {
+// errorMessage = null;
+// } else {
+// errorMessage = "";
+// String[] sc = (String[]) serverCollisions.toArray(new String[serverCollisions.size()]);
+// String[] rtc = (String[]) runtimeCollisions.toArray(new String[runtimeCollisions.size()]);
+// if( rtc.length > 0 )
+// errorMessage += Messages.UpgradeWizardLaunchRuntimeNamesInUse + implode(rtc, ", ") + "\n";
+// if( sc.length > 0 )
+// errorMessage += Messages.UpgradeWizardLaunchServerNamesInUse + implode(sc, ", ");
+// }
+// setErrorMessage(errorMessage);
+// }
+//
+// protected String implode(String[] array, String separator) {
+// if( array.length == 0 ) return "";
+// String ret = "";
+// for( int i = 0; i < array.length; i++ ) {
+// ret += array[i] + separator;
+// }
+// return ret.substring(0, ret.length() - separator.length());
+// }
+//
+// protected class ConfigurationRow {
+// private TempLaunchConfiguration config;
+//
+// private Button shouldConvert;
+// private Label nameLabel;
+// private Text runtimeText;
+// private Text serverText;
+//
+// public ConfigurationRow(TempLaunchConfiguration config, Composite parent) {
+// this.config = config;
+//
+// shouldConvert = new Button(parent, SWT.CHECK);
+// shouldConvert.setSelection(true);
+// GridData shouldConvertData = new GridData(GridData.HORIZONTAL_ALIGN_CENTER);
+// shouldConvert.setLayoutData(shouldConvertData);
+//
+// nameLabel = new Label(parent, SWT.NONE);
+// nameLabel.setText(config.getName());
+//
+// runtimeText = new Text(parent, SWT.BORDER);
+// runtimeText.setText(config.getName() + " Runtime");
+//
+// GridData rtgd = new GridData(GridData.FILL_HORIZONTAL);
+// runtimeText.setLayoutData(rtgd);
+//
+// serverText = new Text(parent, SWT.BORDER);
+// serverText.setText(config.getName());
+// GridData stgd = new GridData(GridData.FILL_HORIZONTAL);
+// serverText.setLayoutData(stgd);
+//
+//
+//
+// // listeners
+// SelectionListener listener = new SelectionListener() {
+// public void widgetDefaultSelected(SelectionEvent e) {
+// }
+//
+// public void widgetSelected(SelectionEvent e) {
+// checkPageComplete();
+// getContainer().updateButtons();
+// }
+// };
+// ModifyListener modListener = new ModifyListener() {
+// public void modifyText(ModifyEvent e) {
+// checkPageComplete();
+// getContainer().updateButtons();
+// }
+// };
+// shouldConvert.addSelectionListener(listener);
+// runtimeText.addModifyListener(modListener);
+// serverText.addModifyListener(modListener);
+//
+// final TempLaunchConfiguration config2 = config;
+// Listener mmListener = new Listener() {
+// public void handleEvent(Event event) {
+// if( event.type == SWT.MouseMove) {
+// configDataComposite.setInput(config2);
+// }
+// }
+// };
+// shouldConvert.addListener(SWT.MouseMove, mmListener);
+// runtimeText.addListener(SWT.MouseMove, mmListener);
+// serverText.addListener(SWT.MouseMove, mmListener);
+// nameLabel.addListener(SWT.MouseMove, mmListener);
+// }
+//
+// public boolean getSelected() {
+// return shouldConvert.getSelection();
+// }
+// public String getName() {
+// return nameLabel.getText();
+// }
+// public String getRuntimeName() {
+// return runtimeText.getText();
+// }
+// public String getServerName() {
+// return serverText.getText();
+// }
+// public TempLaunchConfiguration getLaunchConfig() {
+// return config;
+// }
+// }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2007-09-05 18:12:31 UTC (rev 3465)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2007-09-06 04:52:32 UTC (rev 3466)
@@ -70,7 +70,7 @@
class="org.jboss.ide.eclipse.as.ui.launch.JBossLaunchConfigurationTabGroup"
description="%jbossLaunchconfigurationTabGroupDescription"
id="org.jboss.ide.eclipse.as.core.jbossLaunchTabGroup"
- type="org.jboss.ide.eclipse.as.core.server.launchConfiguration"/>
+ type="org.jboss.ide.eclipse.as.core.server.startupConfiguration"/>
</extension>
16 years, 8 months
- 1
- 0
JBoss Tools SVN: r3465 - branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-09-05 14:12:31 -0400 (Wed, 05 Sep 2007)
New Revision: 3465
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-744, scrolling was restored
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2007-09-05 16:59:39 UTC (rev 3464)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2007-09-05 18:12:31 UTC (rev 3465)
@@ -38,7 +38,6 @@
import org.mozilla.interfaces.nsISelection;
import org.mozilla.interfaces.nsISelectionController;
import org.mozilla.interfaces.nsISelectionDisplay;
-import org.mozilla.interfaces.nsISupports;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -1280,8 +1279,11 @@
// if (frameSelection != null) {
// frameSelection.setMouseDownState(true);
// }
- mouseEvent.preventDefault();
- mouseEvent.stopPropagation();
+
+ // was commented by Max Areshkau (with this code scrolling doesn't works)
+ //
+// mouseEvent.preventDefault();
+// mouseEvent.stopPropagation();
}
}
16 years, 8 months
- 1
- 0
JBoss Tools SVN: r3464 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-05 12:59:39 -0400 (Wed, 05 Sep 2007)
New Revision: 3464
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-400
username / password added to server editor
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2007-09-05 16:27:31 UTC (rev 3463)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2007-09-05 16:59:39 UTC (rev 3464)
@@ -16,10 +16,10 @@
swf_Title=Create a new JBoss Server
swf_Description=
swf_RuntimeInformation=Runtime Information
-swf_AuthorizationDescription=Authorization Details
swf_Explanation=A JBoss Server manages starting and stopping instances of JBoss. \nIt manages command line arguments and keeps track of which modules have been deployed.
swf_Explanation2=If the runtime information below is incorrect, please press back, Installed Runtimes..., \nand then Add to create a new runtime from a different location.
-swf_AuthenticationGroup=Set the login and password for your server
+swf_AuthorizationDescription=Set the login and password for your server.\nThis will ensure it starts and stops properly.
+swf_AuthenticationGroup=Login Credentials
swf_Username=User Name
swf_Password=Password
swf_BaseName=JBoss _VERSION_ Server
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2007-09-05 16:59:39 UTC (rev 3464)
@@ -0,0 +1,99 @@
+package org.jboss.ide.eclipse.as.ui.editor;
+
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
+import org.eclipse.wst.server.ui.editor.ServerEditorSection;
+import org.eclipse.wst.server.ui.internal.command.ServerCommand;
+import org.jboss.ide.eclipse.as.core.server.JBossServer;
+import org.jboss.ide.eclipse.as.ui.Messages;
+
+public class ServerPasswordSection extends ServerEditorSection {
+
+ public void init(IEditorSite site, IEditorInput input) {
+ super.init(site, input);
+ }
+
+ public void createSection(Composite parent) {
+ super.createSection(parent);
+ FormToolkit toolkit = new FormToolkit(parent.getDisplay());
+
+ Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED|ExpandableComposite.TITLE_BAR);
+ section.setText(Messages.swf_AuthenticationGroup);
+ section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL));
+
+ Composite composite = toolkit.createComposite(section);
+
+ composite.setLayout(new GridLayout(2, false));
+ Label explanation = toolkit.createLabel(composite, Messages.swf_AuthorizationDescription);
+ GridData d = new GridData(); d.horizontalSpan = 2;
+ explanation.setLayoutData(d);
+
+ Label name = toolkit.createLabel(composite, Messages.swf_Username);
+ final Text nameText = toolkit.createText(composite, ((ServerWorkingCopy)server).getAttribute(JBossServer.SERVER_USERNAME, ""));
+ Label pass = toolkit.createLabel(composite, Messages.swf_Password);
+ final Text passText = toolkit.createText(composite, ((ServerWorkingCopy)server).getAttribute(JBossServer.SERVER_PASSWORD, ""));
+
+ d = new GridData(); d.grabExcessHorizontalSpace = true; d.widthHint = 100;
+ nameText.setLayoutData(d);
+ d = new GridData(); d.grabExcessHorizontalSpace = true; d.widthHint = 100;
+ passText.setLayoutData(d);
+
+
+ nameText.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ execute(new SetVarCommand(server, nameText, nameText.getText(), JBossServer.SERVER_USERNAME));
+ }
+ });
+
+ passText.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ execute(new SetVarCommand(server, passText, passText.getText(), JBossServer.SERVER_PASSWORD));
+ }
+ });
+
+ toolkit.paintBordersFor(composite);
+ section.setClient(composite);
+ }
+
+
+ public static class SetVarCommand extends ServerCommand {
+ private String oldVal;
+ private String newVal;
+ private String key;
+ private Text text;
+
+ public SetVarCommand(IServerWorkingCopy wc, Text text, String newVal, String attributeKey) {
+ super(wc, "SetVarCommand");
+ this.text = text;
+ this.key = attributeKey;
+ this.newVal = newVal;
+ if( wc instanceof ServerWorkingCopy ) {
+ this.oldVal = ((ServerWorkingCopy)wc).getAttribute(attributeKey, "");
+ }
+ }
+
+ public void execute() {
+ if( server instanceof ServerWorkingCopy )
+ ((ServerWorkingCopy)server).setAttribute(key, newVal);
+ }
+
+ public void undo() {
+ if( server instanceof ServerWorkingCopy )
+ ((ServerWorkingCopy)server).setAttribute(key, oldVal);
+ text.setText(oldVal);
+ }
+ }
+
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2007-09-05 16:27:31 UTC (rev 3463)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2007-09-05 16:59:39 UTC (rev 3464)
@@ -217,7 +217,7 @@
}
protected void createAuthenticationGroup(Composite main) {
- authenticationGroup = new Group(main, SWT.BORDER);
+ authenticationGroup = new Group(main, SWT.NONE);
authenticationGroup.setText(Messages.swf_AuthenticationGroup);
FormData groupData = new FormData();
groupData.left = new FormAttachment(0,5);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2007-09-05 16:27:31 UTC (rev 3463)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2007-09-05 16:59:39 UTC (rev 3464)
@@ -212,10 +212,16 @@
point="org.eclipse.wst.server.ui.editorPageSections">
<section
class="org.jboss.ide.eclipse.as.ui.editor.StrippedServerDeploySection"
- id="org.jboss.ide.eclipse.as.ui.deployServer.deployDir"
+ id="org.jboss.ide.eclipse.as.ui.exitor.deployServer.deployDir"
insertionId="org.eclipse.wst.server.editor.overview.left"
order="10"
typeIds="org.jboss.ide.eclipse.as.systemCopyServer"/>
+ <section
+ class="org.jboss.ide.eclipse.as.ui.editor.ServerPasswordSection"
+ id="org.jboss.ide.eclipse.as.ui.editor.passwordSection"
+ insertionId="org.eclipse.wst.server.editor.overview.left"
+ order="10"
+ typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42"/>
</extension>
16 years, 8 months
- 1
- 0
JBoss Tools SVN: r3463 - trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-09-05 12:27:31 -0400 (Wed, 05 Sep 2007)
New Revision: 3463
Added:
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.3
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.4
Log:
http://jira.jboss.com/jira/browse/EXIN-337
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.3
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.3 (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.3 2007-09-05 16:27:31 UTC (rev 3463)
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd">
+ <component class="java.lang.Boolean" name="myComponent" scope="page">
+ <property name="property1">value1</property>
+ <property name="myList">
+ <value>value1</value>
+ </property>
+ <property name="myMap">
+ <key>key1</key>
+ <value>map value 1</value>
+ </property>
+ </component>
+
+ <component class="java.lang.String" name="myNewPackage.myTextComponent" scope="application">
+ <property name="property1">value1</property>
+ <property name="myList">
+ <value>value1</value>
+ </property>
+ <property name="myMap">
+ <key>key1</key>
+ <value>map value 1</value>
+ </property>
+ </component>
+
+ <core:managed-persistence-context name="myPersistenceContext1"/>
+
+ <core:resource-bundle>
+ <core:bundle-names>
+ <value>bundleA</value>
+ <value>bundleB</value>
+ </core:bundle-names>
+ </core:resource-bundle>
+
+ <core:manager
+ conversation-is-long-running-parameter="a"
+ parent-conversation-id-parameter="b"
+ conversation-id-parameter="c"
+ concurrent-request-timeout="2"
+ conversation-timeout="3"
+ />
+
+ <factory name="factory1" scope="conversation"/>
+
+</components>
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.4
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.4 (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.4 2007-09-05 16:27:31 UTC (rev 3463)
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd">
+ <component class="java.lang.Boolean" name="myComponent" scope="page">
+ <property name="property1">value1</property>
+ <property name="myList">
+ <value>value1</value>
+ </property>
+ <property name="myMap">
+ <key>key1</key>
+ <value>map value 1</value>
+ </property>
+ </component>
+ <core:managed-persistence-context name="myPersistenceContext1"/>
+
+ <core:resource-bundle>
+ <core:bundle-names>
+ <value>bundleA</value>
+ <value>bundleB</value>
+ </core:bundle-names>
+ </core:resource-bundle>
+
+ <core:manager
+ conversation-is-long-running-parameter="a"
+ parent-conversation-id-parameter="b"
+ conversation-id-parameter="c"
+ concurrent-request-timeout="2"
+ conversation-timeout="3"
+ />
+
+ <factory name="factory1" scope="conversation"/>
+
+</components>
16 years, 8 months
- 1
- 0
JBoss Tools SVN: r3462 - in trunk/seam/tests/org.jboss.tools.seam.ui.test: src/org/jboss/tools/seam/ui/test/view and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-09-05 12:27:16 -0400 (Wed, 05 Sep 2007)
New Revision: 3462
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2
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/EXIN-337
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1 2007-09-05 15:42:00 UTC (rev 3461)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.1 2007-09-05 16:27:16 UTC (rev 3462)
@@ -2,6 +2,7 @@
<components xmlns="http://jboss.com/products/seam/components"
xmlns:core="http://jboss.com/products/seam/core"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd">
+
<component class="java.lang.Boolean" name="myComponent" scope="page">
<property name="property1">value1</property>
<property name="myList">
@@ -12,6 +13,7 @@
<value>map value 1</value>
</property>
</component>
+
<component class="java.lang.String" name="myPackage.myStringComponent" scope="application">
<property name="property1">value1</property>
<property name="myList">
@@ -22,6 +24,7 @@
<value>map value 1</value>
</property>
</component>
+
<core:managed-persistence-context name="myPersistenceContext1"/>
<core:resource-bundle>
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2 2007-09-05 15:42:00 UTC (rev 3461)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/TestComponentView/WebContent/WEB-INF/components.2 2007-09-05 16:27:16 UTC (rev 3462)
@@ -12,6 +12,18 @@
<value>map value 1</value>
</property>
</component>
+
+ <component class="java.lang.String" name="myPackage.myTextComponent" scope="application">
+ <property name="property1">value1</property>
+ <property name="myList">
+ <value>value1</value>
+ </property>
+ <property name="myMap">
+ <key>key1</key>
+ <value>map value 1</value>
+ </property>
+ </component>
+
<core:managed-persistence-context name="myPersistenceContext1"/>
<core:resource-bundle>
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 2007-09-05 15:42:00 UTC (rev 3461)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-05 16:27:16 UTC (rev 3462)
@@ -69,6 +69,7 @@
public void testComponentView(){
addComponent();
+ renameComponent();
deleteComponent();
}
@@ -113,6 +114,68 @@
}
}
+
+ public void renameComponent(){
+ CommonNavigator navigator = getSeamComponentsView();
+ navigator.getCommonViewer().expandAll();
+
+ Tree tree = navigator.getCommonViewer().getTree();
+
+ ISeamPackage seamPackage = findSeamPackage(tree, "myPackage");
+ assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
+
+ if(seamPackage != null){
+ ISeamComponent component = findSeamComponent(seamPackage, "myPackage.myStringComponent");
+ assertTrue("Component \"myPackage.myStringComponent\" not found!",component!=null);
+ }
+
+ IFile file1 = project.getFile("WebContent/WEB-INF/components.2");
+ assertTrue("Cannot find components.2 in test project", file1 != null && file1.exists());
+
+ try{
+ file.setContents(file1.getContents(), false, false, new NullProgressMonitor());
+ }catch(Exception ex){
+ JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.2", ex);
+ }
+
+ try {
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ } catch (Exception e) {
+ JUnitUtils.fail("Cannot build test Project", e);
+ }
+
+ seamPackage = findSeamPackage(tree, "myPackage");
+ assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
+
+ if(seamPackage != null){
+ ISeamComponent component = findSeamComponent(seamPackage, "myPackage.myTextComponent");
+ assertTrue("Component \"myPackage.myTextComponent\" not found!",component!=null);
+ }
+
+ IFile file2 = project.getFile("WebContent/WEB-INF/components.3");
+ assertTrue("Cannot find components.3 in test project", file2 != null && file2.exists());
+
+ try{
+ file.setContents(file2.getContents(), false, false, new NullProgressMonitor());
+ }catch(Exception ex){
+ JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.3", ex);
+ }
+
+ try {
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ } catch (Exception e) {
+ JUnitUtils.fail("Cannot build test Project", e);
+ }
+
+ seamPackage = findSeamPackage(tree, "myNewPackage");
+ assertTrue("Package \"myNewPackage\" not found!",seamPackage!=null);
+
+ if(seamPackage != null){
+ ISeamComponent component = findSeamComponent(seamPackage, "myNewPackage.myTextComponent");
+ assertTrue("Component \"myNewPackage.myTextComponent\" not found!",component!=null);
+ }
+
+ }
public void deleteComponent(){
CommonNavigator navigator = getSeamComponentsView();
@@ -125,21 +188,21 @@
// showTreeItem(tree.getItem(i),0);
// }
- ISeamPackage seamPackage = findSeamPackage(tree, "myPackage");
- assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
+ ISeamPackage seamPackage = findSeamPackage(tree, "myNewPackage");
+ assertTrue("Package \"myNewPackage\" not found!",seamPackage!=null);
if(seamPackage != null){
- ISeamComponent component = findSeamComponent(seamPackage, "myPackage.myStringComponent");
- assertTrue("Component \"myPackage.myStringComponent\" not found!",component!=null);
+ ISeamComponent component = findSeamComponent(seamPackage, "myNewPackage.myTextComponent");
+ assertTrue("Component \"myNewPackage.myTextComponent\" not found!",component!=null);
}
- IFile file1 = project.getFile("WebContent/WEB-INF/components.2");
+ IFile file1 = project.getFile("WebContent/WEB-INF/components.4");
assertTrue("Cannot find components.2 in test project", file1 != null && file1.exists());
try{
file.setContents(file1.getContents(), false, false, new NullProgressMonitor());
}catch(Exception ex){
- JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.2", ex);
+ JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.4", ex);
}
try {
@@ -159,8 +222,8 @@
// showTreeItem(tree.getItem(i),0);
// }
- seamPackage = findSeamPackage(tree, "myPackage");
- assertTrue("Package \"myPackage\" found!",seamPackage==null);
+ seamPackage = findSeamPackage(tree, "myNewPackage");
+ assertTrue("Package \"myNewPackage\" found!",seamPackage==null);
}
16 years, 8 months
- 1
- 0
JBoss Tools SVN: r3461 - trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-05 11:42:00 -0400 (Wed, 05 Sep 2007)
New Revision: 3461
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java
Log:
NPE trying to refresh non-existant view
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2007-09-05 14:51:01 UTC (rev 3460)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2007-09-05 15:42:00 UTC (rev 3461)
@@ -168,7 +168,8 @@
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_FULL_FILESET_ROOT_DIR, showFullFilesetRootDir.getSelection(), getElement());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_PROJECT_ROOT, showProjectRoot.getSelection(), getElement());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_ALL_PROJECTS, showAllProjects.getSelection(), getElement());
- ProjectArchivesView.getInstance().refreshViewer(null);
+ if( ProjectArchivesView.getInstance() != null )
+ ProjectArchivesView.getInstance().refreshViewer(null);
return true;
}
16 years, 8 months
- 1
- 0
JBoss Tools SVN: r3460 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mdryakhlenkov
Date: 2007-09-05 10:51:01 -0400 (Wed, 05 Sep 2007)
New Revision: 3460
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/DiagramEditPart.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/AddOrmNatureAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/HBMViewerFilter.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/OrmContentProvider.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/ViewsAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/generateDDL/GenerateDDLPage1.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/mappingwizard/MappingWizardPage3.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/mappingwizard/MappingWizardPage7.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/queries/NamedQueryEditorPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/queries/QueryResultContentProvider.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/tablesclasses/TablesClassesWizard.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/tablesclasses/TablesClassesWizardPage2.java
Log:
JBIDE-882: Clean out hibernate plugins code
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/DiagramEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/DiagramEditPart.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/DiagramEditPart.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -39,6 +39,7 @@
import org.eclipse.gef.requests.CreateRequest;
import org.jboss.tools.hibernate.core.IDatabaseTable;
import org.jboss.tools.hibernate.core.IPersistentClass;
+import org.jboss.tools.hibernate.veditor.VizualEditorPlugin;
import org.jboss.tools.hibernate.veditor.editors.VizualEditor;
import org.jboss.tools.hibernate.veditor.editors.command.ShapeSetConstraintCommand;
import org.jboss.tools.hibernate.veditor.editors.model.ModelElement;
@@ -95,7 +96,9 @@
if(xy.length>1)
try {
ormShape.setLocation(new Point(Integer.parseInt(xy[0]),Integer.parseInt(xy[1])));
- } catch (NumberFormatException e) {}
+ } catch (NumberFormatException e) {
+ VizualEditorPlugin.getPluginLog().logError(e.getMessage(),e);
+ }
if(xy.length>2)
if((new Boolean(xy[2])).booleanValue())
ormShape.refreshHiden();
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/AddOrmNatureAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/AddOrmNatureAction.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/AddOrmNatureAction.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -240,8 +240,7 @@
} catch (InvocationTargetException e1) {
ViewPlugin.getPluginLog().logError("PersistentClasses was not created!",e1);
} catch (InterruptedException e1) {
- //TODO (tau-tau) for Exception
- // Cancelled.
+ ViewPlugin.getPluginLog().logError(e1);
}
if ( ormMapping == null) return false;
@@ -305,8 +304,7 @@
} catch (InvocationTargetException e1) {
ViewPlugin.getPluginLog().logError("Error in order to add Orm Nature",e1);
} catch (InterruptedException e1) {
- //TODO (tau-tau) for Exception
- // Cancelled.
+ ViewPlugin.getPluginLog().logError(e1);
}
return true;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/HBMViewerFilter.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/HBMViewerFilter.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/HBMViewerFilter.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -27,6 +27,7 @@
import org.eclipse.jface.viewers.ViewerFilter;
import org.jboss.tools.hibernate.core.IMappingStorage;
import org.jboss.tools.hibernate.core.exception.ExceptionHandler;
+import org.jboss.tools.hibernate.view.ViewPlugin;
/**
@@ -71,7 +72,7 @@
fSrc.add(pfr[i].getPath().toString());
}
} catch (CoreException e) {
- ExceptionHandler.logThrowableError(e, null);
+ ViewPlugin.getPluginLog().logError(e);
}
}
@@ -93,7 +94,7 @@
}
}
} catch (CoreException e) {
- ExceptionHandler.logThrowableError(e, null);
+ ViewPlugin.getPluginLog().logError(e);
}
return added;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/OrmContentProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/OrmContentProvider.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/OrmContentProvider.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -556,7 +556,7 @@
}
}
} catch (CoreException e) {
- ExceptionHandler.logThrowableError(e, "projectChanged");
+ ViewPlugin.getPluginLog().logError(e);
}
}
return flag;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/ViewsAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/ViewsAction.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/view/views/ViewsAction.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -299,7 +299,7 @@
try {
ViewPlugin.getDefault().getWorkbench().showPerspective("org.hibernate.eclipse.console.HibernateConsolePerspective",ViewPlugin.getActiveWorkbenchWindow());
} catch (WorkbenchException e) {
- ExceptionHandler.logThrowableWarning(e,"Show Hibernate Console");
+ ViewPlugin.getPluginLog().logError("Show Hibernate Console", e);
}
}
};
@@ -356,7 +356,7 @@
try {
project.getProject().getWorkspace().run(runnable, new NullProgressMonitor());
} catch (CoreException e) {
- ExceptionHandler.handle(e,ViewPlugin.getActiveWorkbenchShell(),null, "Error in Edit Field Mapping.");
+ ViewPlugin.getPluginLog().logError("Error in Edit Field Mapping.", e);
}
// add tau 09.11.2005
@@ -415,7 +415,7 @@
try {
project.getProject().getWorkspace().run(runnable, new NullProgressMonitor());
} catch (CoreException e) {
- ExceptionHandler.handle(e,ViewPlugin.getActiveWorkbenchShell(),null, "Error in New Field Mapping.");
+ ViewPlugin.getPluginLog().logError("Error in New Field Mapping.", e);
}
// add tau 09.11.2005
@@ -1422,7 +1422,7 @@
} catch (InvocationTargetException e) {
ExceptionHandler.handle(e,ViewPlugin.getActiveWorkbenchShell(),packageAutoMappingAction.getText(), "Error in package Auto Mapping Action.");
} catch (InterruptedException e1) {
- // Cancelled.
+ ViewPlugin.getPluginLog().logError(e1);
}
}
};
@@ -1530,7 +1530,7 @@
refreshMappingSchemaMappingAction.getText(),
"Error in Refresh Mapping.");
} catch (InterruptedException e1) {
- // Cancelled.
+ ViewPlugin.getPluginLog().logError(e1);
}
}
};
@@ -1662,7 +1662,7 @@
} catch (InvocationTargetException e) {
ExceptionHandler.handle(e,ViewPlugin.getActiveWorkbenchShell(),null, "Error in Reload Mapping");
} catch (InterruptedException e1) {
- // Cancelled.
+ ViewPlugin.getPluginLog().logError(e1);
}
}
};
@@ -1722,7 +1722,7 @@
} catch (InvocationTargetException e) {
ExceptionHandler.handle(e,ViewPlugin.getActiveWorkbenchShell(),null, "Error in Refresh Project.");
} catch (InterruptedException e1) {
- // Cancelled.
+ ViewPlugin.getPluginLog().logError(e1);
}
}
};
@@ -1990,7 +1990,7 @@
} catch (InvocationTargetException e) {
ExceptionHandler.handle(e,ViewPlugin.getActiveWorkbenchShell(),null, "Error in remove hibernate configuration action.");
} catch (InterruptedException e1) {
- // Cancelled.
+ ViewPlugin.getPluginLog().logError(e1);
}
}
};
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/generateDDL/GenerateDDLPage1.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/generateDDL/GenerateDDLPage1.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/generateDDL/GenerateDDLPage1.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -251,7 +251,7 @@
try {
generator = new HibernateDDLGenerator();
} catch (NoClassDefFoundError e) {
-
+ ViewPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/mappingwizard/MappingWizardPage3.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/mappingwizard/MappingWizardPage3.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/mappingwizard/MappingWizardPage3.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -47,6 +47,7 @@
import org.jboss.tools.hibernate.internal.core.hibernate.ComponentMapping;
import org.jboss.tools.hibernate.internal.core.hibernate.PropertyMapping;
import org.jboss.tools.hibernate.internal.core.hibernate.SimpleValueMapping;
+import org.jboss.tools.hibernate.view.ViewPlugin;
/**
@@ -590,7 +591,7 @@
try {
dlg.open();
} catch (IllegalArgumentException e) {
- //TODO (tau-tau) for Exception
+ ViewPlugin.getPluginLog().logError(e);
}
// #changed#
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/mappingwizard/MappingWizardPage7.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/mappingwizard/MappingWizardPage7.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/mappingwizard/MappingWizardPage7.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -407,7 +407,6 @@
((HibernateAutoMapping)mod.getAutoMappingService()).createVersionMapping((ClassMapping)mapping,(HibernateConfiguration)mod.getConfiguration(),SelectedField);
} catch (CoreException e) {
ExceptionHandler.handle(e, getShell(), null, null);
- e.printStackTrace();
}
if (!isCreateField.getSelection())
{
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/queries/NamedQueryEditorPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/queries/NamedQueryEditorPage.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/queries/NamedQueryEditorPage.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -69,6 +69,7 @@
import org.jboss.tools.hibernate.internal.core.properties.ListPropertyDescriptor;
import org.jboss.tools.hibernate.internal.core.properties.PropertyDescriptorsHolder;
import org.jboss.tools.hibernate.internal.core.properties.QLConfiguration;
+import org.jboss.tools.hibernate.view.ViewPlugin;
import org.jboss.tools.hibernate.wizard.classloader.DefaultClassLoaderFactory;
import org.jboss.tools.hibernate.wizard.hibernateconnection.HibernateConnectionWizardPage2;
@@ -694,7 +695,9 @@
if (session.isConnected()) {
try {
session.disconnect();
- } catch(HibernateException e) {}
+ } catch(HibernateException e) {
+ ViewPlugin.getPluginLog().logError(e);
+ }
}
if (session.isOpen()) {
session.close();
@@ -707,7 +710,7 @@
connection=null;
}
} catch (SQLException e) {
- //TODO (tau-tau) for Exception
+ ViewPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/queries/QueryResultContentProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/queries/QueryResultContentProvider.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/queries/QueryResultContentProvider.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -28,6 +28,7 @@
import org.jboss.tools.hibernate.internal.core.PersistentField;
import org.jboss.tools.hibernate.internal.core.hibernate.PersistableProperty;
import org.jboss.tools.hibernate.internal.core.util.*;
+import org.jboss.tools.hibernate.view.ViewPlugin;
/**
* @author yan
@@ -274,14 +275,14 @@
if (!field.isAccessible()) field.setAccessible(true);
return field.get(src);
} catch (Exception e) {
- //TODO (tau-tau) for Exception
+ ViewPlugin.getPluginLog().logError(e);
}
try {
Method method=src.getClass().getDeclaredMethod("get"+name.substring(0,1).toUpperCase()+name.substring(1),new Class[0]);
if (!method.isAccessible()) method.setAccessible(true);
return method.invoke(src,(Object[])null);
} catch (Exception e) {
- //TODO (tau-tau) for Exception
+ ViewPlugin.getPluginLog().logError(e);
}
throw new NoSuchFieldException(name);
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/tablesclasses/TablesClassesWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/tablesclasses/TablesClassesWizard.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/tablesclasses/TablesClassesWizard.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -160,19 +160,16 @@
try {
doFinish( monitor);
} catch (Exception e) {
- //TODO (tau-tau) for Exception
- e.printStackTrace();
+ ViewPlugin.getPluginLog().logError(e);
}
monitor.done();
}};
try {
getContainer().run(true, false, op);
} catch (InvocationTargetException e) {
- //TODO (tau-tau) for Exception
- e.printStackTrace();
+ ViewPlugin.getPluginLog().logError(e);
} catch (InterruptedException e) {
- //TODO (tau-tau) for Exception
- e.printStackTrace();
+ ViewPlugin.getPluginLog().logError(e);
}
return true;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/tablesclasses/TablesClassesWizardPage2.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/tablesclasses/TablesClassesWizardPage2.java 2007-09-05 14:00:02 UTC (rev 3459)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/src/org/jboss/tools/hibernate/wizard/tablesclasses/TablesClassesWizardPage2.java 2007-09-05 14:51:01 UTC (rev 3460)
@@ -45,6 +45,7 @@
import org.jboss.tools.hibernate.core.exception.ExceptionHandler;
import org.jboss.tools.hibernate.dialog.AutoMappingSetting;
import org.jboss.tools.hibernate.dialog.xpl.CreatePackageDialog;
+import org.jboss.tools.hibernate.view.ViewPlugin;
/**
@@ -359,7 +360,7 @@
}
}
} catch (JavaModelException ex) {
- //TODO (tau-tau) for Exception
+ ViewPlugin.getPluginLog().logError(ex);
}
return result;
}
16 years, 8 months
- 1
- 0
JBoss Tools SVN: r3459 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/impl and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mdryakhlenkov
Date: 2007-09-05 10:00:02 -0400 (Wed, 05 Sep 2007)
New Revision: 3459
Removed:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/Example.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/impl/Item.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/impl/Items.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/SpecialOrmShape.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmContentProvider.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ViewsAction.java
Log:
JBIDE-882: Clean out hibernate plugins code
Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/Example.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/Example.java 2007-09-05 13:55:01 UTC (rev 3458)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/Example.java 2007-09-05 14:00:02 UTC (rev 3459)
@@ -1,132 +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
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.hibernate.ui.veditor.editors.autolayout;
-
-import java.util.ArrayList;
-
-public class Example {
-
- public static IDiagramInfo generateRandomProcess(int nodeCount, int linkCount) {
- ProcessInfoImpl process = new ProcessInfoImpl();
- for (int i = 0; i < nodeCount; i++) {
- ItemInfoImpl item = new ItemInfoImpl();
- item.setID("n_" + i);
- process.addItem(item);
- }
- IItemInfo[] items = process.getItems();
- for (int i = 0; i < linkCount; i++) {
- int n1 = (int)(nodeCount * Math.random());
- int n2 = (int)(nodeCount * Math.random());
- String target = ((ItemInfoImpl)items[n2]).getID();
- LinkInfoImpl link = new LinkInfoImpl();
- link.setTargetID(target);
- ((ItemInfoImpl)items[n1]).addLink(link);
- }
- return process;
- }
-
- static void printProcess(IDiagramInfo process) {
- IItemInfo[] items = process.getItems();
- for (int i = 0; i < items.length; i++) printItem(items[i]);
- }
-
- static void printItem(IItemInfo item) {
- System.out.print(item.getID() + " (");
- int[] shape = item.getShape();
- for (int i = 0; i < shape.length; i++) {
- if(i > 0) System.out.print(",");
- System.out.print(shape[i]);
- }
- System.out.print(") -->");
- ILinkInfo[] links = item.getLinks();
- for (int i = 0; i < links.length; i++) {
- if(i > 0) System.out.print(",");
- System.out.print(links[i].getTargetID());
- }
- System.out.println("");
- }
-
- public static void main(String[] args) {
- IDiagramInfo process = generateRandomProcess(10, 17);
- System.out.println("Before Layout");
- printProcess(process);
- AutoLayout layout = new AutoLayout();
- layout.setGridStep("" + 8);
- layout.setOverride(true);
- layout.setProcess(process);
- System.out.println("After Layout");
- printProcess(process);
- }
-}
-
-class ProcessInfoImpl implements IDiagramInfo {
- ArrayList items = new ArrayList();
-
- public IItemInfo[] getItems() {
- return (IItemInfo[])items.toArray(new IItemInfo[0]);
- }
-
- public void addItem(IItemInfo item) {
- items.add(item);
- }
-
-}
-
-class ItemInfoImpl implements IItemInfo {
- String id = "";
- int[] shape = new int[0];
- ArrayList links = new ArrayList();
-
- public void setID(String id) {
- this.id = id;
- }
-
- public String getID() {
- return id;
- }
-
- public boolean isComment() {
- return false;
- }
-
- public int[] getShape() {
- return shape;
- }
-
- public ILinkInfo[] getLinks() {
- return (ILinkInfo[])links.toArray(new ILinkInfo[0]);
- }
-
- public void addLink(ILinkInfo link) {
- links.add(link);
- }
-
- public void setShape(int[] s) {
- this.shape = s;
- }
-
-}
-
-class LinkInfoImpl implements ILinkInfo {
- String target;
-
- public void setTargetID(String target) {
- this.target = target;
- }
-
- public String getTargetID() {
- return target;
- }
-
- public void setLinkShape(int[] vs) {
- }
-
-}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/impl/Item.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/impl/Item.java 2007-09-05 13:55:01 UTC (rev 3458)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/impl/Item.java 2007-09-05 14:00:02 UTC (rev 3459)
@@ -72,9 +72,6 @@
}
public void print() {
-// StringBuffer sb = new StringBuffer();
-/// sb.append(object.getPathPart() + " " + n + " g = " + group + " ix = " + ix + " iy = " + iy);
-/// System.out.println(sb.toString());
}
public boolean isComment() {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/impl/Items.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/impl/Items.java 2007-09-05 13:55:01 UTC (rev 3458)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/autolayout/impl/Items.java 2007-09-05 14:00:02 UTC (rev 3459)
@@ -12,6 +12,7 @@
import java.util.*;
+import org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin;
import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.IItemInfo;
import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.ILinkInfo;
import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.IDiagramInfo;
@@ -38,7 +39,7 @@
public void setProcess(IDiagramInfo process) {
this.process = process;
- try { load(); } catch (Exception e) { e.printStackTrace(); }
+ try { load(); } catch (Exception e) { VisualEditorPlugin.getPluginLog().logError(e); }
}
private void load() {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-09-05 13:55:01 UTC (rev 3458)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-09-05 14:00:02 UTC (rev 3459)
@@ -607,7 +607,7 @@
FileOutputStream fos = new FileOutputStream(file);
properties.store(fos, "");
} catch (IOException e) {
- VisualEditorPlugin.getDefault().logError("Can't save layout of mapping.", e);
+ VisualEditorPlugin.getPluginLog().logError("Can't save layout of mapping.", e);
}
}
@@ -624,7 +624,7 @@
file.create(source, true, null);
}
} catch (CoreException e) {
- VisualEditorPlugin.getDefault().logError(e);
+ VisualEditorPlugin.getPluginLog().logError(e);
}
}
return file;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/SpecialOrmShape.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/SpecialOrmShape.java 2007-09-05 13:55:01 UTC (rev 3458)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/SpecialOrmShape.java 2007-09-05 14:00:02 UTC (rev 3459)
@@ -14,6 +14,7 @@
import org.hibernate.mapping.Property;
import org.hibernate.mapping.RootClass;
+import org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin;
public class SpecialOrmShape extends OrmShape {
private Shape parentShape;
@@ -49,6 +50,7 @@
}
getChildren().add(bodyOrmShape);
} catch (Exception e) {
+ VisualEditorPlugin.getPluginLog().logError(e);
}
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java 2007-09-05 13:55:01 UTC (rev 3458)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/DiagramEditPart.java 2007-09-05 14:00:02 UTC (rev 3459)
@@ -41,6 +41,7 @@
import org.hibernate.mapping.Component;
import org.hibernate.mapping.RootClass;
import org.hibernate.mapping.Table;
+import org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin;
import org.jboss.tools.hibernate.ui.veditor.editors.VisualEditor;
import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.AutoLayout;
import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.IItemInfo;
@@ -109,6 +110,7 @@
ormShape.setLocation(new Point(Integer
.parseInt(xy[0]), Integer.parseInt(xy[1])));
} catch (NumberFormatException e) {
+ VisualEditorPlugin.getPluginLog().logError(e);
}
if (xy.length > 2)
if ((new Boolean(xy[2])).booleanValue())
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java 2007-09-05 13:55:01 UTC (rev 3458)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java 2007-09-05 14:00:02 UTC (rev 3459)
@@ -98,7 +98,6 @@
public void performRequest(Request req) {
if(RequestConstants.REQ_OPEN.equals(req.getType())) {
-// if (getCastedModel().getOrmElement() instanceof IDatabaseColumn) {
if (getCastedModel().getOrmElement() instanceof Column) {
if(getCastedModel().getTargetConnections().size() > 0)
((Connection)getCastedModel().getTargetConnections().get(0)).getSource().setFocus();
@@ -190,20 +189,16 @@
Integer.parseInt(Messages.Colors_PersistentClassR),
Integer.parseInt(Messages.Colors_PersistentClassG),
Integer.parseInt(Messages.Colors_PersistentClassB)));
-//R if (getCastedModel().getOrmElement() instanceof IPersistentField || getCastedModel().getOrmElement() instanceof IHibernateValueMapping)
else if (element instanceof Property || element instanceof SimpleValue)
return ResourceManager.getInstance().getColor(new RGB(
Integer.parseInt(Messages.Colors_PersistentFieldR),
Integer.parseInt(Messages.Colors_PersistentFieldG),
Integer.parseInt(Messages.Colors_PersistentFieldB)));
-//R else if (getCastedModel().getOrmElement() instanceof IDatabaseColumn)
else if (element instanceof Column)
return ResourceManager.getInstance().getColor(new RGB(
Integer.parseInt(Messages.Colors_DatabaseColumnR),
Integer.parseInt(Messages.Colors_DatabaseColumnG),
Integer.parseInt(Messages.Colors_DatabaseColumnB)));
-//R else if (getCastedModel().getOrmElement() instanceof IPersistentClass)
-//R else if (getCastedModel().getOrmElement() instanceof IDatabaseTable)
else if (element instanceof Table)
return ResourceManager.getInstance().getColor(new RGB(
Integer.parseInt(Messages.Colors_DatabaseTableR),
@@ -221,7 +216,6 @@
Integer.parseInt(Messages.Colors_PersistentFieldB)));
else
return ResourceManager.getInstance().getColor(new RGB(255, 0, 0));
-// throw new IllegalArgumentException();
}
protected Color getSelectionColor() {
@@ -232,8 +226,6 @@
return ResourceManager.getInstance().getColor(new RGB(112,161,99));
else if (getCastedModel().getOrmElement() instanceof Table || getCastedModel().getOrmElement() instanceof Column)
return ResourceManager.getInstance().getColor(new RGB(66,173,247));
- //else
- //throw new IllegalArgumentException();
return ResourceManager.getInstance().getColor(new RGB(255,0,0));
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java 2007-09-05 13:55:01 UTC (rev 3458)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java 2007-09-05 14:00:02 UTC (rev 3459)
@@ -60,10 +60,6 @@
} catch (MissingResourceException x) {
resourceBundle = null;
}
-
-// if (TRACE || TRACE_VIEW )
-// ExceptionHandler.logObjectPlugin("ViewPlugin()",PLUGIN_ID, null);
-
}
public static ImageDescriptor getImageDescriptor(String name) {
@@ -73,7 +69,6 @@
URL url = new URL(installURL, iconPath + name);
return ImageDescriptor.createFromURL(url);
} catch (MalformedURLException e) {
- // should not happen
return ImageDescriptor.getMissingImageDescriptor();
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmContentProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmContentProvider.java 2007-09-05 13:55:01 UTC (rev 3458)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmContentProvider.java 2007-09-05 14:00:02 UTC (rev 3459)
@@ -20,6 +20,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.TreeItem;
+import org.jboss.tools.hibernate.ui.view.ViewPlugin;
public class OrmContentProvider implements ITreeContentProvider/*, IOrmModelListener, IOrmProjectChangedListener*/ {
@@ -50,7 +51,7 @@
public OrmContentProvider(int tip){
this.tip = tip;
- sorting = true; // default - sort
+ sorting = true;
}
public Object[] getChildren(Object parentElement) {
@@ -58,29 +59,16 @@
children = nullChildren;
if (!sorting){
- sorting = true; // default - sort
- } else {
-// Arrays.sort(children, comparator);
+ sorting = true;
}
return children;
}
public Object getParent(Object element) {
-
- //if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("!!! OrmContentProvider.getParent(Object element):" + element + ", tip="+tip);
-
return null;
}
public boolean hasChildren(Object element) {
- //TODO EXP 3d
- //return getChildren(element).length > 0;
-// if (element instanceof IDatabaseColumn ||
-// element instanceof IDatabaseConstraint ||
-// element instanceof INamedQueryMapping ||
-// element instanceof String) {
-// return false;
-// } else
return true;
}
@@ -93,147 +81,8 @@
}
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("OrmContentProvider.inputChanged():"+", tip="+tip+", this= " + this);
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("OrmContentProvider.inputChanged(): OLD_INPUT= " + oldInput + ", tip="+tip);
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("OrmContentProvider.inputChanged(): NEW_INPUT= " + newInput + ", tip="+tip);
-//
-// this.viewer = (TreeViewer) viewer;
-//
-// if (oldInput != null) {
-// removeListenerFrom((IOrmModel) oldInput);
-// }
-//
-// if (newInput != null) {
-// addListenerTo((IOrmModel) newInput);
-// }
}
-// protected void removeListenerFrom(IOrmModel model) {
-// model.removeListener(this);
-// IOrmProject[] projects = model.getOrmProjects();
-// for (int i = 0; i < projects.length; i++) {
-// IOrmProject project = projects[i];
-// project.removeChangedListener(this);
-// // add tau 12.09.2005
-// //project.removeBeforeChangeListener(this);
-// }
-// }
-
-// protected void addListenerTo(IOrmModel model) {
-// model.addListener(this);
-// IOrmProject[] projects = model.getOrmProjects();
-// for (int i = 0; i < projects.length; i++) {
-// IOrmProject project = projects[i];
-// project.addChangedListener(this);
-// // add tau 12.09.2005
-// //project.addBeforeChangeListener(this);
-// }
-// }
-
- /*
- * (non-Javadoc)
- *
- * @see org.jboss.tools.hibernate.core.IOrmModelListener#projectsChanged(org.jboss.tools.hibernate.core.OrmModelEvent)
- */
-// public void modelChanged(OrmModelEvent event) {
-//
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW )
-// ExceptionHandler.logInfo("OrmContentProvider.modelChanged(OrmModelEvent)" + ",tip="+tip);
-//
-// // Add tau 21.06.2005
-// int type = event.getType();
-// if (type == OrmModelEvent.AddProject){
-// ((IOrmProject) event.getProject()).addChangedListener(this);
-// // add tau 28.11.2005
-// //((IOrmProject) event.getProject()).addBeforeChangeListener(this);
-// }
-//
-//
-// // Update tau 18.05.2005
-// final IOrmModel model = event.getOrmModel();
-// viewerRefreshUpdate(model, false);
-//
-// /*
-// Control control = viewer.getControl();
-// if (control == null || control.isDisposed())
-// return;
-//
-// control.getDisplay().syncExec(new Runnable() {
-// public void run() {
-// if (!viewer.getControl().isDisposed()){
-// viewer.getTree().setRedraw(false);
-// viewer.refresh(model, true);
-// viewer.getTree().setRedraw(true);
-// // add 04.04.2005
-// //viewer.getControl().setFocus();
-// }
-// }
-// });
-// */
-//
-// }
-
- /*
- * edit 05.12.2005
- *
- * @see org.jboss.tools.hibernate.core.IOrmProjectListener#modelChanged(org.jboss.tools.hibernate.core.OrmProjectEvent)
- */
-// public void projectChanged(OrmProjectEvent event, boolean flagUpdate) {
-//
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("OrmContentProvider.projectChanged((eventSource=," + event.getSource()+ "), tip="+tip);
-//
-// final IOrmProject project = event.getProject();
-//
-// viewerRefreshUpdate(project, flagUpdate);
-//
-// /* del tau 05.2005
-// //!!! event from OrmBuilder == IOrmProject - edit tau 05.12.2005
-// if (event.getSource() instanceof IOrmProject || !(isBuilder(project.getProject()))){
-// viewerRefresh(project);
-// }
-// */
-// }
-
- /*
- public void projectBeforeChange(OrmProjectEvent event) {
-
- Control control = viewer.getControl();
- if (control == null || control.isDisposed()) {
- if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("->NO REFRESH, control="+ control + ",tip="+tip);
- return;
- }
-
- // add tau 17.11.2005
- if (beforeChangeElements != null){
- if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("->projectBeforeChange("+event.getSource()+")beforeChangeElements != null"+",tip="+tip);
- return;
- }
-
- // TODO (!tau->tau) asyncExec???
- //control.getDisplay().asyncExec(new Runnable() {
- control.getDisplay().syncExec(new Runnable() {
- public void run() {
- // edit tau 24.11.2005 +OrmCore.lock.acquire();
- try {
- if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("-> TRY projectBeforeChange(...) lock(=" + OrmCore.lock + ").acquire(), Depth=" + OrmCore.lock.getDepth() + ", tip="+tip);
- OrmCore.lock.acquire();
- lockMenu = true; // add tau 05.12.2005
- if (!viewer.getControl().isDisposed()) {
- beforeChangeElements = saveElements();
- beforeChangeSelectionElementQualifiedName = saveSelection();
- }
- } finally {
- OrmCore.lock.release();
- lockMenu = false; // add tau 05.12.2005
- if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("-> END projectBeforeChange(...)=lock(=" + OrmCore.lock.toString() + ").release(), Depth=" + OrmCore.lock.getDepth() + ", tip="+tip);
- }
- }
- });
- }
- */
-
-
public int getTip() {
return tip;
}
@@ -242,12 +91,6 @@
this.sorting = sorting;
}
- /*
- public String toString() {
- return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
- */
-
public Object[] getExpandedElements() {
return expandedElements;
}
@@ -265,64 +108,30 @@
}
public void viewerRefreshUpdate(final Object element, final boolean flagUpdate) {
-
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("OrmContentProvider.viewerRefresh(...)1= " + element + " ,flagUpdate = "+ flagUpdate);
-
Control control = viewer.getControl();
if (control == null || control.isDisposed()) {
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("-> NO REFRESH, control="+ control + ",tip="+tip);
return;
}
Display display = control.getDisplay();
-
- /*
- Thread tc = display.getSyncThread();
- boolean dd = display.isDisposed();
- boolean dd2 = display.isDisposed();
- Thread tt = display.getThread();
-
- // add tau 24.01.2006
- display.wake();
-
- if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("OrmContentProvider.viewerRefresh(...)4= " + tc + tt + dd + dd2);
- */
-
- // edit tau 30.01.2006
- //display.syncExec(new Runnable() {
display.asyncExec(new Runnable() {
public void run() {
- // add try and OrmCore.lock.acquire(); - tau 01.12.2005
try {
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("-> TRY REFRESH lock(=" + OrmCore.lock + ").acquire(), Depth=" + OrmCore.lock.getDepth() + ", viewerRefresh("+element+"),tip="+tip);
-// OrmCore.lock.acquire();
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("-> RUN REFRESH, viewerRefresh("+element+"), isDisposed()="+ viewer.getControl().isDisposed() + ",tip="+tip);
-
if (!viewer.getControl().isDisposed()) {
-
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("-> REFRESHing, viewerRefresh("+element+"),tip="+tip);
-
viewer.getTree().setRedraw(false);
-
- // add tau 02.12.2005 SAVE
if (beforeChangeElements == null){
beforeChangeElements = saveElements();
beforeChangeSelectionElementQualifiedName = saveSelection();
}
if (flagUpdate) {
- // Update
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("viewerRefresh("+element+") -> viewer.update(element, null), tip = "+tip);
viewer.update(element, null);
} else {
- // REFRESH
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("viewerRefresh("+element+") -> viewer.refresh(element, true), tip = "+tip);
viewer.refresh(element, true);
}
- // LOAD
if (beforeChangeElements != null){
restoreElements(beforeChangeElements, beforeChangeSelectionElementQualifiedName);
beforeChangeElements = null;
@@ -330,24 +139,20 @@
viewer.getTree().setRedraw(true);
}
- } finally {
-// OrmCore.lock.release();
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("-> END REFRESH=lock(=" + OrmCore.lock.toString() + ").release(), Depth=" + OrmCore.lock.getDepth() + ", viewerRefresh("+element+"),tip="+tip);
- }
+ } catch (Exception e) {
+ ViewPlugin.getDefault().logError(e);
+ }
}
});
}
- // tau 08.11.2005
private String[] saveElements() {
- // add tau 15.11.2005
String [] expandedElements = null;
int length = viewer.getExpandedElements().length;
if (length != 0) {
expandedElements = new String [length];
}
- //
int j = 0;
TreeItem[] items = viewer.getTree().getItems();
@@ -355,83 +160,35 @@
TreeItem item = items[i];
j = saveItem(item, expandedElements, j);
}
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW) ExceptionHandler.logInfo(".saveElements()= " + length + ",tip="+tip);
return expandedElements;
}
- // tau 08.11.2005
private int saveItem(TreeItem treeItem, String [] expandedElements, int j) {
-// if (treeItem.getExpanded()) {
-// if (treeItem.getData() instanceof IOrmElement ){
-// expandedElements[j++] = ((IOrmElement)treeItem.getData()).getQualifiedName(treeItem);
-// TreeItem[] items = treeItem.getItems();
-// for (int i = 0; i < items.length; i++) {
-// j = saveItem(items[i], expandedElements, j);
-// }
-// } else {
-// return j;
-// }
-//
-// }
return j;
}
private String saveSelection() {
- String selectionElementQualifiedName = ""; // default
+ String selectionElementQualifiedName = "";
ISelection selection = viewer.getSelection();
if (!selection.isEmpty()) {
TreeItem[] selectionTreeItems = viewer.getTree().getSelection();
if (selectionTreeItems.length != 0) {
TreeItem selectionItem = selectionTreeItems[0];
if (selection instanceof StructuredSelection) {
- // edit tau 05.04.2006 for /ESORM-562
- //IOrmElement selectionElement = (IOrmElement) ((StructuredSelection) selection).getFirstElement();
Object selectionElement = ((StructuredSelection) selection).getFirstElement();
-// if (selectionElement instanceof IOrmElement) {
-// IOrmElement selectionOrmElement = (IOrmElement) selectionElement;
-// selectionElementQualifiedName = selectionOrmElement.getQualifiedName(selectionItem);
-// }
}
}
}
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW) ExceptionHandler.logInfo(".saveSelection()= " + selectionElementQualifiedName + ",tip="+tip);
return selectionElementQualifiedName;
}
private void restoreElements(String[] expandedElements, String selectionElementQualifiedName) {
- //viewer.getTree().setRedraw(false);
checkItem(viewer.getTree().getItems(), expandedElements, selectionElementQualifiedName);
- //viewer.getTree().setRedraw(true);
- //if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW) ExceptionHandler.logInfo(".restoreElements()=" + expandedElements.length + ", tip="+tip);
}
- // #changed# by Konstantin Mishin on 03.09.2005 fixed for ORMIISTUD-699
private void checkItem(TreeItem[] items, String[] expandedElements, String selectionElementQualifiedName) {
for (int j = 0; j < items.length; j++) {
TreeItem item = items[j];
-
- // add tau 07.03.2006
-// if (!(item.getData() instanceof IOrmElement)){
-// continue;
-// }
-
-// IOrmElement itemElement = (IOrmElement) item.getData();
-// String itemElementQualifiedName = itemElement.getQualifiedName(item);
-// if (itemElementQualifiedName.equals("")) continue;
-//
-// if (selectionElementQualifiedName != null && selectionElementQualifiedName.equals(itemElementQualifiedName)) {
-// viewer.setSelection(new StructuredSelection(itemElement), true);
-// // add tau 28.11.2005
-// viewer.reveal(itemElement);
-// }
-//
-// for (int i = 0; i < expandedElements.length; i++) {
-// if (itemElementQualifiedName.equals(expandedElements[i])) {
-// viewer.setExpandedState(itemElement, true);
-// TreeItem[] childrenItems = item.getItems();
-// checkItem(childrenItems, expandedElements, selectionElementQualifiedName);
-// }
-// }
}
}
@@ -439,20 +196,6 @@
boolean flag = false;
if (project.getWorkspace().isAutoBuilding()) {
IProjectDescription description;
-// try {
-// description = project.getProject().getDescription();
-// ICommand[] builderCommands = description.getBuildSpec();
-// flag = false;
-// for (int i = 0; i < builderCommands.length; i++){
-// if (builderCommands[i].getBuilderName().equals(OrmHibernateNature.ORM_HIBERNATE_BUILDER_ID)) {
-// flag = true;
-// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("OrmContentProvider.isBuilder(...), tip="+tip + ",flagRefresh->"+flag);
-// break;
-// }
-// }
-// } catch (CoreException e) {
-// ExceptionHandler.logThrowableError(e, "projectChanged");
-// }
}
return flag;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2007-09-05 13:55:01 UTC (rev 3458)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OrmModelNameVisitor.java 2007-09-05 14:00:02 UTC (rev 3459)
@@ -15,6 +15,7 @@
import org.eclipse.jdt.core.Signature;
import org.eclipse.jface.text.TextUtilities;
import org.eclipse.jface.viewers.ContentViewer;
+import org.hibernate.cfg.reveng.JDBCToHibernateTypeHelper;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Component;
import org.hibernate.mapping.DependantValue;
@@ -35,7 +36,6 @@
static private String POINTER = " -> ";
- // add 16.03.2005 tau
private ResourceBundle BUNDLE = ResourceBundle
.getBundle(OrmModelNameVisitor.class.getPackage().getName()
+ ".views");
@@ -48,163 +48,9 @@
public Object visitDatabaseColumn(Column column, Object argument) {
StringBuffer name = new StringBuffer();
name.append(column.getName());
-
- int length = -1;
- int scale = -1;
-// if (!column.isNativeType())
-// {
-// int typeCode = column.getSqlTypeCode();
-// String typeName = column.getSqlTypeName();
-//
-// if (typeName == null) typeCode = Types.NULL;
-//
-// //by Nick
-//
-// // (tau->tau) Column types should be shown in the following manner:
-// /*
-//
-// Character types:
-// VARCHAR(length)
-// CHAR(length)
-//
-// Numeric types:
-// NUMBER(length, precision)
-// NUMERIC(length, precision)
-//
-// Other types:
-// BIT
-// INTEGER
-// BIGNINT
-// DATE
-// FLOAT
-// REAL
-// CLOB
-// BINARY
-// etc. */
-// //by Nick 22.04.2005
-// /*
-// switch (key) {
-// case value:
-//
-// break;
-//
-// default:
-// break;
-// }
-// */
-//
-// // TODO (tau->tau)
-// // testing for ORACLE
-//
-// // edit tau 28.04.2005 -> vs ()
-//
-// switch (typeCode) {
-// case Types.VARCHAR:
-// case Types.CHAR:
-// case Types.NUMERIC:
-// case Types.DECIMAL: //8.07.2005 by Nick DECIMAL JDBC type denotes Oracle NUMBER type
-// //changed by Nick 10.05.2005 - fixes "->" in SQL types
-// if (typeCode == Types.NUMERIC || typeCode == Types.DECIMAL) {
-// length = column.getPrecision();
-// scale = column.getScale();
-// }
-// else
-// {
-// length = column.getLength();
-// }
-//
-// default:
-// break;
-//
-// }
-// }
-// else
-// {
-// if (column.getLength() > Column.DEFAULT_LENGTH)
-// {
-// length = column.getLength();
-// }
-// else if (column.getPrecision() > Column.DEFAULT_PRECISION || column.getScale() > Column.DEFAULT_SCALE)
-// {
-// length = column.getPrecision() > Column.DEFAULT_PRECISION ? (column.getPrecision()) : (column.getScale() > 0 ? column.getScale() : 1);
-// scale = column.getScale();
-// }
-// }
-
-// StringBuffer typeName = new StringBuffer(column.getSqlTypeName());
-//
-// //by Nick
-//
-// // (tau->tau) Column types should be shown in the following manner:
-// /*
-//
-// Character types:
-// VARCHAR(length)
-// CHAR(length)
-//
-// Numeric types:
-// NUMBER(length, precision)
-// NUMERIC(length, precision)
-//
-// Other types:
-// BIT
-// INTEGER
-// BIGNINT
-// DATE
-// FLOAT
-// REAL
-// CLOB
-// BINARY
-// etc. */
-// //by Nick 22.04.2005
-// /*
-// switch (key) {
-// case value:
-//
-// break;
-//
-// default:
-// break;
-// }
-// */
-//
-// // TODO (tau->tau)
-// // testing for ORACLE
-//
-//
-// StringBuffer lpBuffer = new StringBuffer();
-// //name.append(POINTER);
-//
-// if (length > Column.DEFAULT_LENGTH)
-// {
-// lpBuffer.append(SPACE);
-// lpBuffer.append(BUNDLE.getString("OrmModelNameVisitor.OpenBrackets"));
-// lpBuffer.append(length);
-// if (scale > Column.DEFAULT_SCALE)
-// {
-// lpBuffer.append(BUNDLE.getString("OrmModelNameVisitor.Comma"));
-// lpBuffer.append(SPACE);
-// lpBuffer.append(scale);
-// }
-// lpBuffer.append(BUNDLE.getString("OrmModelNameVisitor.CloseBrackets"));
-// }
-// //by Nick
-//
-// if (typeName.length() != 0)
-// {
-// // edit tau 28.04.2005 -> vs ()
-// //8.07.2005 by Nick DECIMAL JDBC type denotes Oracle NUMBER type
-// //changed by Nick 10.05.2005 - fixes "->" in SQL types
-// name.append(BUNDLE.getString("OrmModelNameVisitor.Colon"));
-// name.append(SPACE);
-// typeName.append(lpBuffer);
-// }
-//
-// name.append(typeName);
-//// name.append(SPACE);
-//
-// // by Nick
+// String s = JDBCToHibernateTypeHelper.getJDBCTypeName(column.getSqlTypeCode().intValue());
+
return name.toString();
}
@@ -212,22 +58,14 @@
public Object visitPersistentClass(RootClass clazz, Object argument) {
StringBuffer name = new StringBuffer();
-// if (((OrmContentProvider) viewer.getContentProvider()).getTip() == OrmContentProvider.PACKAGE_CLASS_FIELD_CONTENT_PROVIDER) {
- name.append(clazz.getEntityName() != null ? clazz.getEntityName() : clazz.getClassName());
-// } else {
-// name.append(clazz.getEntityName());
-// }
+ name.append(clazz.getEntityName() != null ? clazz.getEntityName() : clazz.getClassName());
- //edit tau 24.04.2006
Table table = clazz.getTable(); // upd tau 06.06.2005
- //IDatabaseTable table = HibernateAutoMappingHelper.getPrivateTable(classMapping); // upd tau 18.04.2005
if (table != null) {
String tableName = HibernateUtils.getTableName(table);
if (tableName != null) {
- //name.append(" (");
name.append(POINTER);
name.append(tableName);
- //name.append(")");
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ViewsAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ViewsAction.java 2007-09-05 13:55:01 UTC (rev 3458)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ViewsAction.java 2007-09-05 14:00:02 UTC (rev 3459)
@@ -36,7 +36,7 @@
try {
IDE.openEditor(ViewPlugin.getPage(),input ,"org.jboss.tools.hibernate.ui.veditor.editors.visualeditor");
} catch (PartInitException e) {
-// ExceptionHandler.logThrowableError(e,"OpenEditor");
+ ViewPlugin.getDefault().logError(e);
}
}
};
16 years, 8 months
- 1
- 0
JBoss Tools SVN: r3458 - trunk/documentation/GettingStartedGuide/docs/userguide/en/images.
by jbosstools-commits＠lists.jboss.org
Author: sabrashevich
Date: 2007-09-05 09:55:01 -0400 (Wed, 05 Sep 2007)
New Revision: 3458
Modified:
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/newproject22.png
trunk/documentation/GettingStartedGuide/docs/userguide/en/images/newproject9.png
Log:
http://jira.jboss.com/jira/browse/RHDS-160 screenshots are retaken
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/newproject22.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/images/newproject9.png
===================================================================
(Binary files differ)
16 years, 8 months
- 1
- 0
JBoss Tools SVN: r3457 - 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: 2007-09-05 09:49:59 -0400 (Wed, 05 Sep 2007)
New Revision: 3457
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/EXIN-337
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 2007-09-05 13:46:20 UTC (rev 3456)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2007-09-05 13:49:59 UTC (rev 3457)
@@ -11,13 +11,8 @@
******************************************************************************/
package org.jboss.tools.seam.ui.test.view;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
import junit.framework.TestCase;
@@ -36,12 +31,10 @@
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.navigator.CommonNavigator;
-import org.jboss.tools.common.model.XJob;
import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.jst.web.ui.RedHat4WebPerspectiveFactory;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamPackage;
-import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ISeamScope;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.ui.ISeamUiConstants;
@@ -55,6 +48,7 @@
*/
public class SeamComponentsViewTest extends TestCase {
IProject project;
+ IFile file;
@Override
protected void setUp() throws Exception {
@@ -69,6 +63,8 @@
JUnitUtils.fail("Cannot create Project Provider", e1);
}
project = provider.getProject();
+ file = project.getFile("WebContent/WEB-INF/components.xml");
+ assertTrue("Cannot find components.xml in test project", file != null && file.exists());
}
public void testComponentView(){
@@ -84,10 +80,7 @@
} catch (Exception e) {
JUnitUtils.fail("Cannot build test Project", e);
}
-
- IFile file = project.getFile("WebContent/WEB-INF/components.xml");
- assertTrue("Cannot find components.xml in test project", file != null && file.exists());
-
+
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
@@ -100,7 +93,7 @@
assertTrue("Cannot find components.1 in test project", file1 != null && file1.exists());
try{
- file.setContents(file1.getContents(), true, false, new NullProgressMonitor());
+ file.setContents(file1.getContents(), false, false, new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.1", ex);
}
@@ -122,19 +115,15 @@
}
public void deleteComponent(){
-
- IFile file = project.getFile("WebContent/WEB-INF/components.xml");
- assertTrue("Cannot find components.xml in test project", file != null && file.exists());
-
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
Tree tree = navigator.getCommonViewer().getTree();
- System.out.println("tree.getItemCount() - "+tree.getItemCount());
- for(int i=0;i<tree.getItemCount();i++){
- showTreeItem(tree.getItem(i),0);
- }
+// System.out.println("tree.getItemCount() - "+tree.getItemCount());
+// for(int i=0;i<tree.getItemCount();i++){
+// showTreeItem(tree.getItem(i),0);
+// }
ISeamPackage seamPackage = findSeamPackage(tree, "myPackage");
assertTrue("Package \"myPackage\" not found!",seamPackage!=null);
@@ -148,21 +137,27 @@
assertTrue("Cannot find components.2 in test project", file1 != null && file1.exists());
try{
- file.setContents(file1.getContents(), true, false, new NullProgressMonitor());
+ file.setContents(file1.getContents(), false, false, new NullProgressMonitor());
}catch(Exception ex){
JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.2", ex);
}
try {
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
} catch (Exception e) {
JUnitUtils.fail("Cannot build test Project", e);
}
- System.out.println("tree.getItemCount() - "+tree.getItemCount());
- for(int i=0;i<tree.getItemCount();i++){
- showTreeItem(tree.getItem(i),0);
- }
+// System.out.println("Before!");
+//
+// waitForJobs();
+//
+// System.out.println("After!");
+
+// System.out.println("tree.getItemCount() - "+tree.getItemCount());
+// for(int i=0;i<tree.getItemCount();i++){
+// showTreeItem(tree.getItem(i),0);
+// }
seamPackage = findSeamPackage(tree, "myPackage");
assertTrue("Package \"myPackage\" found!",seamPackage==null);
@@ -313,5 +308,32 @@
return null;
}
-
+
+ public void waitForJobs() {
+ while (Job.getJobManager().currentJob() != null)
+ delay(10000);
+ }
+
+ /** * Process UI input but do not return for the
+ * specified time interval. *
+ * @param waitTimeMillis the number of milliseconds */
+ protected void delay(long waitTimeMillis) {
+ Display display = Display.getCurrent();
+ // If this is the UI thread,
+ // then process input.
+ if (display != null) {
+ long endTimeMillis = System.currentTimeMillis() + waitTimeMillis;
+ while (System.currentTimeMillis() < endTimeMillis){
+ if (!display.readAndDispatch()) display.sleep();
+ } display.update();
+ }
+ // Otherwise, perform a simple sleep.
+ else {
+ try {
+ Thread.sleep(waitTimeMillis);
+ } catch (InterruptedException e) {
+ // Ignored.
+ }
+ }
+ }
}
16 years, 8 months
- 1
- 0