Author: dgeraskov
Date: 2008-01-15 09:32:15 -0500 (Tue, 15 Jan 2008)
New Revision: 5689
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1412
Didn't work when entityName specified.
Conceal exceptions - impossible to test.
Add return editor to the open methods.
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java
===================================================================
---
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2008-01-15
14:19:02 UTC (rev 5688)
+++
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2008-01-15
14:32:15 UTC (rev 5689)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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.actions;
import java.util.Iterator;
@@ -4,10 +14,12 @@
import java.util.Set;
import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.mapping.PersistentClass;
+import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.mapping.Property;
import org.jboss.tools.hibernate.ui.veditor.editors.VisualEditor;
import org.jboss.tools.hibernate.ui.veditor.editors.model.SpecialRootClass;
@@ -42,14 +54,21 @@
&& ((Property)selection).getPersistentClass() instanceof SpecialRootClass){
Property compositSel = ((Property)selection);
Property parentProperty =
((SpecialRootClass)((Property)selection).getPersistentClass()).getProperty();
- org.hibernate.eclipse.console.actions.OpenMappingAction.run(compositSel,
parentProperty, consoleConfiguration);
+ try {
+ org.hibernate.eclipse.console.actions.OpenMappingAction.run(compositSel,
parentProperty, consoleConfiguration);
+ } catch (Exception e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage("Can't find or open
mapping file.", e);
+ }
continue;
}
if (selection instanceof SpecialRootClass) {
selection = ((SpecialRootClass)selection).getProperty();
}
- org.hibernate.eclipse.console.actions.OpenMappingAction.run(selection,
consoleConfiguration);
-
+ try {
+ org.hibernate.eclipse.console.actions.OpenMappingAction.run(selection,
consoleConfiguration);
+ } catch (Exception e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage("Can't find or open
mapping file.", e);
+ }
/*IResource resource = null;
Object selectedElement = selection;
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java
===================================================================
---
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2008-01-15
14:19:02 UTC (rev 5688)
+++
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2008-01-15
14:32:15 UTC (rev 5689)
@@ -1,13 +1,17 @@
package org.jboss.tools.hibernate.ui.veditor.editors.actions;
+import java.io.FileNotFoundException;
import java.util.Iterator;
import java.util.Set;
import org.eclipse.core.resources.IResource;
import org.eclipse.gef.ui.actions.SelectionAction;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.jboss.tools.hibernate.ui.veditor.editors.VisualEditor;
@@ -47,11 +51,19 @@
} else continue;
IResource resource = null;
- String fullyQualifiedName = HibernateUtils.getPersistentClassName(rootClass);
- if (fullyQualifiedName.indexOf("$") > 0) {
+ String fullyQualifiedName =
rootClass.getClassName();//HibernateUtils.getPersistentClassName(rootClass);
+ /*if (fullyQualifiedName.indexOf("$") > 0) {
fullyQualifiedName = fullyQualifiedName.substring(0,
fullyQualifiedName.indexOf("$"));
+ }*/
+ try {
+ new org.hibernate.eclipse.console.actions.OpenSourceAction().run(selection, proj,
fullyQualifiedName);
+ } catch (PartInitException e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage("Can't open source
file.", e);
+ } catch (JavaModelException e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage("Can't find source
file.", e);
+ } catch (FileNotFoundException e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage("Can't find source
file.", e);
}
- new org.hibernate.eclipse.console.actions.OpenSourceAction().run(selection, proj,
fullyQualifiedName);
}
}