JBoss Tools SVN: r7371 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-04-07 04:18:53 -0400 (Mon, 07 Apr 2008)
New Revision: 7371
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1559
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java 2008-04-07 07:41:14 UTC (rev 7370)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java 2008-04-07 08:18:53 UTC (rev 7371)
@@ -14,6 +14,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.TreePath;
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
@@ -22,8 +23,6 @@
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.eclipse.console.utils.ProjectUtils;
import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.RootClass;
-import org.hibernate.mapping.Subclass;
import org.jboss.tools.hibernate.ui.view.ViewPlugin;
public class OpenDiagramActionDelegate extends OpenActionDelegate {
@@ -31,17 +30,20 @@
public void run(IAction action) {
ObjectPluginAction objectPluginAction = (ObjectPluginAction)action;
- Object first_el = ((TreeSelection)objectPluginAction.getSelection()).getFirstElement();
- if (first_el instanceof PersistentClass) {
- PersistentClass persClass = (PersistentClass) first_el;
- ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)(((TreeSelection)objectPluginAction.getSelection()).getPaths()[0]).getSegment(0);
-
- try {
- openEditor(persClass, consoleConfiguration);
- } catch (PartInitException e) {
- ViewPlugin.getDefault().logError("Can't open mapping view.", e);
- }
- }
+ TreePath[] paths = ((TreeSelection)objectPluginAction.getSelection()).getPaths();
+ for (int i = 0; i < paths.length; i++) {
+ Object last_el = paths[i].getLastSegment();
+ if (last_el instanceof PersistentClass) {
+ PersistentClass persClass = (PersistentClass) last_el;
+ ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)(paths[i].getFirstSegment());
+
+ try {
+ openEditor(persClass, consoleConfiguration);
+ } catch (PartInitException e) {
+ ViewPlugin.getDefault().logError("Can't open mapping view.", e); //$NON-NLS-1$
+ }
+ }
+ }
}
public IEditorPart openEditor(PersistentClass persClass,
@@ -56,6 +58,6 @@
hashMap.put(persClass.getRootClass(), input);
}
- return IDE.openEditor(ViewPlugin.getPage(),input ,"org.jboss.tools.hibernate.ui.veditor.editors.visualeditor");
+ return IDE.openEditor(ViewPlugin.getPage(),input ,"org.jboss.tools.hibernate.ui.veditor.editors.visualeditor"); //$NON-NLS-1$
}
}
\ No newline at end of file
18 years
JBoss Tools SVN: r7370 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-04-07 03:41:14 -0400 (Mon, 07 Apr 2008)
New Revision: 7370
Removed:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/GenerateEntitiesAction.java
Log:
Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/GenerateEntitiesAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/GenerateEntitiesAction.java 2008-04-04 23:02:52 UTC (rev 7369)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/GenerateEntitiesAction.java 2008-04-07 07:41:14 UTC (rev 7370)
@@ -1,271 +0,0 @@
-package org.hibernate.eclipse.console;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.JDBCMetaDataConfiguration;
-import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy;
-import org.hibernate.cfg.reveng.OverrideRepository;
-import org.hibernate.cfg.reveng.ReverseEngineeringSettings;
-import org.hibernate.cfg.reveng.ReverseEngineeringStrategy;
-import org.hibernate.cfg.reveng.TableFilter;
-import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.console.HibernateConsoleRuntimeException;
-import org.hibernate.console.execution.ExecutionContext.Command;
-import org.hibernate.eclipse.console.model.impl.ExporterDefinition;
-import org.hibernate.eclipse.console.model.impl.ExporterFactory;
-import org.hibernate.eclipse.console.utils.DialogSelectionHelper;
-import org.hibernate.eclipse.launch.PathHelper;
-import org.hibernate.mapping.Table;
-import org.hibernate.tool.hbm2x.ArtifactCollector;
-import org.hibernate.tool.hbm2x.Exporter;
-
-public class GenerateEntitiesAction implements IObjectActionDelegate {
-
- private TreeSelection selection;
-
- private String outputPath;
-
- private Map<ConsoleConfiguration, List<Table>> tableGroups;
-
- public void run(IAction action) {
-
- IPath[] paths = DialogSelectionHelper.chooseFolderEntries(null, null,
- Messages.GenerateSeamEntities_dialog_title,
- Messages.GenerateSeamEntities_dialog_message,
- false);
-
- if (paths.length == 0) return;
-
- outputPath = paths[0].toOSString();
-
- splitOnGroupsByConsoleCfg();
-
- ExporterFactory[] exporters = getExporterFactories();
-
- Set<ConsoleConfiguration> ccs = tableGroups.keySet();
-
- for (Iterator<ConsoleConfiguration> iterator = ccs.iterator(); iterator
- .hasNext();) {
- ConsoleConfiguration consoleConfiguration = iterator.next();
- runExporters(exporters, consoleConfiguration);
- }
-
- refreshOutputDir(getOutputPath());
- }
-
- private ArtifactCollector runExporters(
- final ExporterFactory[] exporterFactories, ConsoleConfiguration cc) {
- final IProgressMonitor monitor = new NullProgressMonitor();
-
- monitor.beginTask("Generating code for " + cc.getName(), exporterFactories.length + 1); //$NON-NLS-1$
-
- final Configuration cfg = buildConfiguration(cc, tableGroups.get(cc));
-
- monitor.worked(1);
-
- if (monitor.isCanceled())
- return null;
-
- return (ArtifactCollector) cc.execute(new Command() {
-
- public Object execute() {
- ArtifactCollector artifactCollector = new ArtifactCollector();
-
- // Global properties
- Properties props = new Properties();
- props.put("ejb3", "true"); //$NON-NLS-1$ //$NON-NLS-2$
- props.put("jdk5", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-
- for (int i = 0; i < exporterFactories.length; i++) {
- monitor.subTask(exporterFactories[i]
- .getExporterDefinition().getDescription());
-
- Properties globalProperties = new Properties();
- globalProperties.putAll(props);
-
- Set outputDirectories = new HashSet();
- Exporter exporter;
- try {
- exporter = exporterFactories[i]
- .createConfiguredExporter(cfg, getOutputPath(),
- null, globalProperties,
- outputDirectories, artifactCollector);
- } catch (CoreException e) {
- throw new HibernateConsoleRuntimeException(
- "Error while setting up " //$NON-NLS-1$
- + exporterFactories[i]
- .getExporterDefinition(), e);
- }
-
- exporter.start();
- monitor.worked(1);
- }
- return artifactCollector;
- }
-
- });
-
- }
-
- private ExporterFactory[] getExporterFactories() {
- List<String> exporterNames = new ArrayList<String>();
- exporterNames.add("org.hibernate.tools.hbm2java"); //$NON-NLS-1$
- //exporterNames.add("org.hibernate.tools.hbm2dao"); //$NON-NLS-1$
-
- Map exDefinitions = ExtensionManager.findExporterDefinitionsAsMap();
- List<ExporterFactory> factories = new ArrayList<ExporterFactory>();
-
- for (Iterator<String> iterator = exporterNames.iterator(); iterator
- .hasNext();) {
- String exporterId = iterator.next();
-
- ExporterDefinition expDef = (ExporterDefinition) exDefinitions
- .get(exporterId);
- if (expDef == null) {
- throw new HibernateConsoleRuntimeException(
- "Could not locate exporter for '" + exporterId + "'"); //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- ExporterFactory exporterFactory = new ExporterFactory(expDef,
- exporterId);
- factories.add(exporterFactory);
- }
- }
- return factories.toArray(new ExporterFactory[factories.size()]);
- }
-
- private Configuration buildConfiguration(ConsoleConfiguration cc,
- final List<Table> tables) {
- Configuration configuration = null;
- if (cc.hasConfiguration()) {
- configuration = cc.getConfiguration();
- } else {
- configuration = cc.buildWith(null, false);
- }
-
- final JDBCMetaDataConfiguration cfg = new JDBCMetaDataConfiguration();
- Properties properties = configuration.getProperties();
- cfg.setProperties(properties);
- cc.buildWith(cfg, false);
-
- cfg.setPreferBasicCompositeIds(true);
-
- cc.execute(new Command() {
- /* need to execute in the console configuration to let it handle classpath stuff!*/
- public Object execute() {
-
- OverrideRepository repository = new OverrideRepository();
-
- TableFilter filter = null;
- for (int i = 0; i < tables.size(); i++) {
- Table table = tables.get(i);
-
- filter = new TableFilter();
- filter.setExclude(false);
- if (table.getCatalog() != null) {
- filter.setMatchCatalog(table.getCatalog());
- }
- if (table.getSchema() != null) {
- filter.setMatchSchema(table.getSchema());
- }
- filter.setMatchName(tables.get(i).getName());
-
- repository.addTableFilter(filter);
- }
-
- ReverseEngineeringStrategy res = repository
- .getReverseEngineeringStrategy(new DefaultReverseEngineeringStrategy());
-
- ReverseEngineeringSettings qqsettings = new ReverseEngineeringSettings(res)
- .setDetectManyToMany(true)
- .setDetectOptimisticLock(true);
-
- res.setSettings(qqsettings);
-
- cfg.setReverseEngineeringStrategy(res);
-
- cfg.readFromJDBC();
- cfg.buildMappings();
- return null;
- }
- });
-
- return cfg;
- }
-
- private String getOutputPath() {
- return outputPath;
- }
-
- private void splitOnGroupsByConsoleCfg() {
- TreePath[] paths = selection.getPaths();
-
- tableGroups = new HashMap<ConsoleConfiguration, List<Table>>();
-
- for (int i = 0; i < paths.length; i++) {
- if (paths[i].getLastSegment() instanceof Table) {
- ConsoleConfiguration cc = getConsoleConfiguration(paths[i]);
- if (cc == null) continue;
-
- if (tableGroups.containsKey(cc)) {
- List<Table> tables = tableGroups.get(cc);
- tables.add((Table) paths[i].getLastSegment());
- } else {
- List<Table> tables = new ArrayList<Table>();
- tables.add((Table) paths[i].getLastSegment());
- tableGroups.put(cc, tables);
- }
- }
- }
- }
-
- private ConsoleConfiguration getConsoleConfiguration(TreePath path) {
- for (int i = 0; i < path.getSegmentCount(); i++) {
- if (path.getSegment(i) instanceof ConsoleConfiguration)
- return (ConsoleConfiguration) path.getSegment(i);
- }
- return null;
- }
-
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- if (selection instanceof TreeSelection) {
- this.selection = (TreeSelection) selection;
- }
- }
-
- private void refreshOutputDir(String outputdir) {
- IResource bufferRes = PathHelper.findMember(ResourcesPlugin
- .getWorkspace().getRoot(), outputdir);
-
- if (bufferRes != null && bufferRes.isAccessible()) {
- try {
- bufferRes.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (CoreException e) {
- // ignore, maybe merge into possible existing status.
- }
- }
- }
-
-}
18 years
JBoss Tools SVN: r7369 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: dialogs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-04 19:02:52 -0400 (Fri, 04 Apr 2008)
New Revision: 7369
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
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/dialogs/RequiredCredentialsDialog.java
Log:
JBIDE-1646 - externalizing string / modifying string slightly
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2008-04-04 20:00:43 UTC (rev 7368)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2008-04-04 23:02:52 UTC (rev 7369)
@@ -61,7 +61,10 @@
public static String sswf_BaseName;
public static String ServerDialogHeading;
-
+ public static String credentials_warning;
+ public static String credentials_save;
+
+
/* Module extension properties */
public static String ModulePropertyType;
public static String ModulePropertyProject;
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 2008-04-04 20:00:43 UTC (rev 7368)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2008-04-04 23:02:52 UTC (rev 7369)
@@ -32,6 +32,9 @@
sswf_Title=Create a new System Copy Server
sswf_BaseName=Local Deployer
+credentials_warning=Your server is throwing a security exception.\nPlease enter your username and password now, or\nenter them in the server editor by double-clicking on the server.
+credentials_save=Save these credentials?
+
#Server View (server and categories, properties)
property=Property
value=Value
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2008-04-04 20:00:43 UTC (rev 7368)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2008-04-04 23:02:52 UTC (rev 7369)
@@ -84,10 +84,10 @@
passText.setLayoutData(createFormData(passLabel, 5, null, 0, 0,5, 100, -5));
saveCredentials.setLayoutData(createFormData(passText, 10, null, 0, 0,5, 100, -5));
- top.setText("Your server is throwing a security exception.\nYou should make sure to open the server\neditor and save the jmx username and password there.");
+ top.setText(Messages.credentials_warning);
userLabel.setText(Messages.swf_Username);
passLabel.setText(Messages.swf_Password);
- saveCredentials.setText("Save these credentials?");
+ saveCredentials.setText(Messages.credentials_save);
ModifyListener listener = new ModifyListener() {
public void modifyText(ModifyEvent e) {
18 years
JBoss Tools SVN: r7368 - tags/jbosstools-2.1.0.Beta1.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-04-04 16:00:43 -0400 (Fri, 04 Apr 2008)
New Revision: 7368
Added:
tags/jbosstools-2.1.0.Beta1/vpe/
Log:
tagging for 2.1.0.Beta1
Copied: tags/jbosstools-2.1.0.Beta1/vpe (from rev 7367, trunk/vpe)
18 years
JBoss Tools SVN: r7367 - tags/jbosstools-2.1.0.Beta1.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-04-04 16:00:32 -0400 (Fri, 04 Apr 2008)
New Revision: 7367
Added:
tags/jbosstools-2.1.0.Beta1/tests/
Log:
tagging for 2.1.0.Beta1
Copied: tags/jbosstools-2.1.0.Beta1/tests (from rev 7366, trunk/tests)
18 years
JBoss Tools SVN: r7366 - tags/jbosstools-2.1.0.Beta1.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-04-04 16:00:20 -0400 (Fri, 04 Apr 2008)
New Revision: 7366
Added:
tags/jbosstools-2.1.0.Beta1/struts/
Log:
tagging for 2.1.0.Beta1
Copied: tags/jbosstools-2.1.0.Beta1/struts (from rev 7365, trunk/struts)
18 years
JBoss Tools SVN: r7365 - tags/jbosstools-2.1.0.Beta1.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-04-04 16:00:07 -0400 (Fri, 04 Apr 2008)
New Revision: 7365
Added:
tags/jbosstools-2.1.0.Beta1/seam/
Log:
tagging for 2.1.0.Beta1
Copied: tags/jbosstools-2.1.0.Beta1/seam (from rev 7364, trunk/seam)
18 years
JBoss Tools SVN: r7364 - tags/jbosstools-2.1.0.Beta1.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-04-04 15:59:55 -0400 (Fri, 04 Apr 2008)
New Revision: 7364
Added:
tags/jbosstools-2.1.0.Beta1/jst/
Log:
tagging for 2.1.0.Beta1
Copied: tags/jbosstools-2.1.0.Beta1/jst (from rev 7363, trunk/jst)
18 years
JBoss Tools SVN: r7363 - tags/jbosstools-2.1.0.Beta1.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-04-04 15:59:44 -0400 (Fri, 04 Apr 2008)
New Revision: 7363
Added:
tags/jbosstools-2.1.0.Beta1/jsf/
Log:
tagging for 2.1.0.Beta1
Copied: tags/jbosstools-2.1.0.Beta1/jsf (from rev 7362, trunk/jsf)
18 years
JBoss Tools SVN: r7362 - tags/jbosstools-2.1.0.Beta1.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-04-04 15:59:32 -0400 (Fri, 04 Apr 2008)
New Revision: 7362
Added:
tags/jbosstools-2.1.0.Beta1/hibernatetools/
Log:
tagging for 2.1.0.Beta1
Copied: tags/jbosstools-2.1.0.Beta1/hibernatetools (from rev 7361, trunk/hibernatetools)
18 years