Author: max.andersen(a)jboss.com Date: 2008-02-08 07:46:39 -0500 (Fri, 08 Feb 2008) New Revision: 6208 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/.classpath trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/.classpath Log: rolled back jdk1.4 changes plus updated hibernate plugins to explicit ask for jdk5 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/.classpath =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/.classpath 2008-02-08 12:33:37 UTC (rev 6207) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/.classpath 2008-02-08 12:46:39 UTC (rev 6208) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java 2008-02-08 12:33:37 UTC (rev 6207) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/AddConfigurationAction.java 2008-02-08 12:46:39 UTC (rev 6208) @@ -87,7 +87,7 @@ wc.setAttribute(TEMPORARY_CONFIG_FLAG, true); ILaunchConfiguration saved = wc.doSave(); int res = DebugUITools.openLaunchConfigurationPropertiesDialog( part.getSite().getShell(), saved, "org.eclipse.debug.ui.launchGroup.run" ); - List listTempConfigs = new ArrayList(); + List<ILaunchConfiguration> listTempConfigs = new ArrayList<ILaunchConfiguration>(); ILaunchConfiguration[] configs = launchManager.getLaunchConfigurations(launchConfigurationType); for (int i = 0; i < configs.length; i++) { boolean temporary = configs[i].getAttribute(AddConfigurationAction.TEMPORARY_CONFIG_FLAG, false); @@ -97,11 +97,11 @@ } if (res != Window.OK) { for (int i = 0; i < listTempConfigs.size(); i++) { - ((ILaunchConfiguration)listTempConfigs.get(i)).delete(); + listTempConfigs.get(i).delete(); } } else { for (int i = 0; i < listTempConfigs.size(); i++) { - wc = ((ILaunchConfiguration)listTempConfigs.get(i)).getWorkingCopy(); + wc = listTempConfigs.get(i).getWorkingCopy(); wc.setAttribute(TEMPORARY_CONFIG_FLAG, (String)null); // Must be set to null since it should never be in the actual saved configuration! wc.doSave(); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/.classpath =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/.classpath 2008-02-08 12:33:37 UTC (rev 6207) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/.classpath 2008-02-08 12:46:39 UTC (rev 6208) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="build/eclipse"/> </classpath>