June 2008 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r8613 - in trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test: mappingproject and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2008-06-06 12:51:10 -0400 (Fri, 06 Jun 2008) New Revision: 8613 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleTestMessages.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleTestMessages.properties Removed: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/Messages.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/Messages.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/messages.properties trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/messages.properties Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/BeanShellIntegrationTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/HibernateConsoleTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/PerspectiveTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java Log: http://opensource.atlassian.com/projects/hibernate/browse/HBX-500 Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/BeanShellIntegrationTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/BeanShellIntegrationTest.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/BeanShellIntegrationTest.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -9,16 +9,16 @@ public static class CallBack { public void line(int number) { System.out.println(number + ":"); //$NON-NLS-1$ - } + } } - + public void testBsh() { - + Interpreter bsh = new Interpreter(); - + try { bsh.set("callback", new CallBack()); //$NON-NLS-1$ - + StringBuffer buf = new StringBuffer(); buf.append( "int i = 25;\r\n" ); //$NON-NLS-1$ buf.append( "callback.line(1);\r\n" ); //$NON-NLS-1$ @@ -27,13 +27,13 @@ buf.append( "i+j;" ); //$NON-NLS-1$ buf.append( "callback.line(3);" ); //$NON-NLS-1$ Object object = bsh.eval( buf.toString() ); - - System.out.println(Messages.BEANSHELLINTEGRATIONTEST_RESULT + object); - + + System.out.println(ConsoleTestMessages.BeanShellIntegrationTest_result + object); + } catch (EvalError e) { e.printStackTrace(); } - + } } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -25,37 +25,37 @@ public ConsoleConfigurationTest(String name) { super( name ); } - + protected void setUp() throws Exception { super.setUp(); - + TestConsoleConfigurationPreferences cfgprefs = new TestConsoleConfigurationPreferences(); consoleCfg = new ConsoleConfiguration(cfgprefs); KnownConfigurations.getInstance().addConfiguration(consoleCfg, true); } - + protected void tearDown() throws Exception { KnownConfigurations.getInstance().removeAllConfigurations(); } - + static class TestConsoleConfigurationPreferences implements ConsoleConfigurationPreferences { - - public void setName(String name) { + + public void setName(String name) { fail(); } - + public void readStateFrom(Element element) { - fail(); + fail(); } - + public void writeStateTo(Element node) { - fail(); + fail(); } - + public File getPropertyFile() { return null; } - + public File getConfigXMLFile() { File xmlConfig = null; Bundle bundle = HibernateConsoleTestPlugin.getDefault().getBundle(); @@ -67,28 +67,28 @@ } return xmlConfig; } - + public Properties getProperties() { Properties p = new Properties(); p.setProperty("hibernate.dialect", "org.hibernate.dialect.HSQLDialect"); //$NON-NLS-1$ //$NON-NLS-2$ return p; } - + public File[] getMappingFiles() { return new File[0]; } - + public URL[] getCustomClassPathURLS() { return new URL[0]; } - + public String getName() { - return Messages.CONSOLECONFIGTEST_FAKE_PREFS; + return ConsoleTestMessages.ConsoleConfigurationTest_fake_prefs; } - - - public String getEntityResolverName() { + + + public String getEntityResolverName() { return ""; //$NON-NLS-1$ } @@ -105,74 +105,74 @@ // TODO Auto-generated method stub return null; } - + } - - + + static class MockCCListener implements ConsoleConfigurationListener { int factoryBuilt = 0; int factoryClosing = 0; public int queryCreated; - + public void sessionFactoryClosing(ConsoleConfiguration configuration, SessionFactory aboutToCloseFactory) { - factoryClosing++; + factoryClosing++; } - + public void sessionFactoryBuilt(ConsoleConfiguration ccfg, SessionFactory builtSessionFactory) { - factoryBuilt++; + factoryBuilt++; } public void queryPageCreated(QueryPage qp) { queryCreated++; } - - - + + + } - + public void testBuildConfiguration() { - + MockCCListener listener = new MockCCListener(); assertTrue(consoleCfg.getConsoleConfigurationListeners().length==1); consoleCfg.addConsoleConfigurationListener(listener); - + consoleCfg.build(); - + assertEquals(0, listener.factoryBuilt); consoleCfg.buildSessionFactory(); assertEquals(1, listener.factoryBuilt); - + try { consoleCfg.buildSessionFactory(); - fail(Messages.CONSOLECONFIGTEST_FACTORY_ALREADY_EXISTS); + fail(ConsoleTestMessages.ConsoleConfigurationTest_factory_already_exists); } catch (HibernateConsoleRuntimeException hcre) { - + } - + QueryPage qp = consoleCfg.executeHQLQuery("from java.lang.Object"); //$NON-NLS-1$ assertEquals(1, listener.queryCreated); - - consoleCfg.closeSessionFactory(); + + consoleCfg.closeSessionFactory(); assertEquals(1, listener.factoryClosing); - - + + } - + /*public void testCleanup() throws InterruptedException { - + for(int cnt=0;cnt<10000;cnt++) { if(cnt%2==0) { - + System.out.println("Cnt " + cnt + " " + Runtime.getRuntime().freeMemory()/1000); Thread.sleep( 2000 ); } - + consoleCfg.build(); consoleCfg.buildSessionFactory(); consoleCfg.reset(); } - + }*/ } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsolePluginAllTests.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -11,26 +11,26 @@ public static Test suite() throws IOException { TestSuite suite = new TestSuite( - Messages.CONSOLEPLUGINALLTESTS_TEST_FOR ); - + ConsoleTestMessages.ConsolePluginAllTests_test_for ); + suite.addTestSuite( KnownConfigurationsTest.class ); suite.addTestSuite( QueryParametersTest.class ); suite.addTestSuite( PerspectiveTest.class ); suite.addTestSuite( ConsoleConfigurationTest.class ); suite.addTestSuite( JavaFormattingTest.class ); suite.addTestSuite( RefactoringTest.class ); - + suite.addTestSuite( HibernateAllMappingTests.class ); // core tests //Properties properties = new Properties(); //properties.load(ConsolePluginAllTests.class.getResourceAsStream("plugintest-hibernate.properties")); - + //System.getProperties().putAll(properties); - + //suite.addTest(org.hibernate.tool.ToolAllTests.suite() ); - + return suite; } Copied: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleTestMessages.java (from rev 8490, trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/Messages.java) =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleTestMessages.java (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleTestMessages.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -0,0 +1,55 @@ +package org.hibernate.eclipse.console.test; + +import org.eclipse.osgi.util.NLS; + +public class ConsoleTestMessages extends NLS { + private static final String BUNDLE_NAME = "org.hibernate.eclipse.console.test.ConsoleTestMessages"; //$NON-NLS-1$ + public static String BeanShellIntegrationTest_result; + public static String ConsoleConfigurationTest_factory_already_exists; + public static String ConsoleConfigurationTest_fake_prefs; + public static String ConsolePluginAllTests_test_for; + public static String HibernateConsoleTest_long_running_task_detected; + public static String KnownConfigurationsTest_fake_prefs; + public static String KnownConfigurationsTest_new_test; + public static String KnownConfigurationsTest_no_sf_should_be_build; + public static String KnownConfigurationsTest_no_sf_should_be_closed; + public static String KnownConfigurationsTest_trying_remove_non_existing_console; + public static String PerspectiveTest_hibernate; + public static String RefactoringTest_category; + public static String RefactoringTest_coreexception_occurred_work_with_memento; + public static String RefactoringTest_exception_while_filenamechange_refactor; + public static String RefactoringTest_exception_while_findchange_launch_config_processing; + public static String RefactoringTest_exception_while_packnamechange_refactor; + public static String RefactoringTest_exception_while_projnamechange_refactor; + public static String RefactoringTest_exception_while_srcnamechange_refactor; + public static String RefactoringTest_method_not_tested; + public static String RefactoringTest_segmentnum_too_match; + public static String RefactoringTest_test_launch_config; + public static String HibernateAllMappingTests_errors; + public static String HibernateAllMappingTests_fails; + public static String HibernateAllMappingTests_packages_tested; + public static String HibernateAllMappingTests_seconds; + public static String MappingTestProject_folder_not_found; + public static String OpenJavaEditors_error_openning_compilationunit; + public static String OpenMappingDiagramTest_mapping_diagrams_for_package_cannot_be_opened; + public static String OpenMappingDiagramTest_mapping_diagram_for_not_opened; + public static String OpenMappingFileTest_highlighted_region_for_is_empty_package; + public static String OpenMappingFileTest_highlighted_region_for_property_is_empty_package; + public static String OpenMappingFileTest_mapping_file_for_property_not_opened_package; + public static String OpenMappingFileTest_mapping_files_for_package_cannot_be_opened; + public static String OpenMappingFileTest_mapping_file_for_not_opened_package; + public static String OpenSourceFileTest_highlighted_region_for_is_empty; + public static String OpenSourceFileTest_mapping_file_for_not_opened; + public static String OpenSourceFileTest_source_files_for_package_cannot_be_opened; + public static String ProjectUtil_cannot_get_error_field_from_erroreditorpart; + public static String ProjectUtil_cannot_get_exception_from_erroreditorpart; + public static String TestSet_test_for_mappingtestproject; + public static String UpdateConfigurationTest_error_customising_file_for_package; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, ConsoleTestMessages.class); + } + + private ConsoleTestMessages() { + } +} Copied: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleTestMessages.properties (from rev 8490, trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/messages.properties) =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleTestMessages.properties (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleTestMessages.properties 2008-06-06 16:51:10 UTC (rev 8613) @@ -0,0 +1,41 @@ +BeanShellIntegrationTest_result=Result: +ConsoleConfigurationTest_factory_already_exists=Should throw an exception because a factory already exists\! +ConsoleConfigurationTest_fake_prefs=fake prefs +ConsolePluginAllTests_test_for=Test for org.hibernate.eclipse.console.test +HibernateConsoleTest_long_running_task_detected=A long running task detected +KnownConfigurationsTest_fake_prefs=fake prefs +KnownConfigurationsTest_new_test=new test +KnownConfigurationsTest_no_sf_should_be_build=no sf should be built\! +KnownConfigurationsTest_no_sf_should_be_closed=no sf should be closed\! +KnownConfigurationsTest_trying_remove_non_existing_console=trying to remove a non existing console +PerspectiveTest_hibernate=Hibernate +RefactoringTest_category=Category +RefactoringTest_coreexception_occurred_work_with_memento=CoreException occurred when try to work with memento. +RefactoringTest_exception_while_filenamechange_refactor=Exception while FileNameChange refactor processing\! +RefactoringTest_exception_while_findchange_launch_config_processing=Exception while FindChanged launch configurations processing\! +RefactoringTest_exception_while_packnamechange_refactor=Exception while PackNameChange refactor processing\! +RefactoringTest_exception_while_projnamechange_refactor=Exception while ProjectNameChange refactor processing\! +RefactoringTest_exception_while_srcnamechange_refactor=Exception while SrcNameChange refactor processing\! +RefactoringTest_method_not_tested=Method doesn't tested +RefactoringTest_segmentnum_too_match=SegmentNum is too match. +RefactoringTest_test_launch_config=Test Launch Config +HibernateAllMappingTests_errors=\ errors. +HibernateAllMappingTests_fails=\ fails. +HibernateAllMappingTests_packages_tested=\ packages tested. +HibernateAllMappingTests_seconds=\ sec. +MappingTestProject_folder_not_found=Folder {0} not found\! +OpenJavaEditors_error_openning_compilationunit=Error opening CompilationUnit: +OpenMappingDiagramTest_mapping_diagrams_for_package_cannot_be_opened=Mapping Diagrams for package {0} can't be opened:\n{1} +OpenMappingDiagramTest_mapping_diagram_for_not_opened=Mapping Diagram for {0} not opened:\n{1} +OpenMappingFileTest_highlighted_region_for_property_is_empty_package=Highlighted region for property {0} is empty. (package {1}) +OpenMappingFileTest_highlighted_region_for_is_empty_package=Highlighted region for {0} is empty. (package {1}) +OpenMappingFileTest_mapping_file_for_property_not_opened_package=Mapping file for property {0} not opened: (package {1}) :\n{2} +OpenMappingFileTest_mapping_files_for_package_cannot_be_opened=Mapping Files for package {0} can't be opened:\n{1} +OpenMappingFileTest_mapping_file_for_not_opened_package=Mapping file for {0} not opened: (package {1}) :\n{2} +OpenSourceFileTest_highlighted_region_for_is_empty=Highlighted region for {0} is empty. +OpenSourceFileTest_mapping_file_for_not_opened=Mapping file for {0} not opened:\n{1} +OpenSourceFileTest_source_files_for_package_cannot_be_opened=Source files for package {0} can't be opened:\n{1} +ProjectUtil_cannot_get_error_field_from_erroreditorpart=Can't get error field from ErrorEditorPart. +ProjectUtil_cannot_get_exception_from_erroreditorpart=Can't get exception from ErrorEditorPart. +TestSet_test_for_mappingtestproject=Test for MappingTestProject +UpdateConfigurationTest_error_customising_file_for_package=Error customizing {0} file for package {1}.\n{2} Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/HibernateConsoleTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/HibernateConsoleTest.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/HibernateConsoleTest.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -21,7 +21,7 @@ public abstract class HibernateConsoleTest extends TestCase { private static final long MAX_IDLE = 5*60*1000L; - + private SimpleTestProject project; public HibernateConsoleTest(String name) { @@ -32,13 +32,13 @@ super.setUp(); this.project = createTestProject(); - + waitForJobs(); PlatformUI.getWorkbench() .getActiveWorkbenchWindow().getActivePage().setPerspective( PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId(HibernateConsolePerspectiveFactory.ID_CONSOLE_PERSPECTIVE)); - + IPackagesViewPart packageExplorer = null; try { packageExplorer = (IPackagesViewPart) PlatformUI.getWorkbench() @@ -46,22 +46,22 @@ } catch (PartInitException e) { throw new RuntimeException(e); } - + IType type = this.project.getTestClassType(); packageExplorer.selectAndReveal(type); - - + + FileEditorInput input = new FileEditorInput((IFile) type.getCompilationUnit().getCorrespondingResource()); - + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(input, JavaUI.ID_CU_EDITOR ); - + delay(2000); } protected SimpleTestProject createTestProject() { return new SimpleTestProject(); } - + protected void tearDown() throws Exception { waitForJobs(); @@ -76,11 +76,11 @@ super.tearDown(); } - + /** * Process UI input but do not return for the specified time interval. - * + * * @param waitTimeMillis * the number of milliseconds */ @@ -115,17 +115,17 @@ while (Platform.getJobManager().currentJob() != null) delay(2000); }*/ - + public void waitForJobs() { long start = System.currentTimeMillis(); while (!Job.getJobManager().isIdle()) { delay(500); - if ( (System.currentTimeMillis()-start) > MAX_IDLE ) - throw new RuntimeException(Messages.HIBERNATECONSOLETEST_LONG_RUNNING_TASK_DETECTED); + if ( (System.currentTimeMillis()-start) > MAX_IDLE ) + throw new RuntimeException(ConsoleTestMessages.HibernateConsoleTest_long_running_task_detected); } delay(1000); } - + public boolean noMoreJobs() { Job[] queuedJobs= Job.getJobManager().find(null); for (int i= 0; i < queuedJobs.length; i++) { @@ -136,10 +136,9 @@ } return true; } - + protected SimpleTestProject getProject() { return this.project; } - + } - \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -20,90 +20,90 @@ public KnownConfigurationsTest(String name) { super( name ); } - + static class CCListener implements KnownConfigurationsListener { List added = new ArrayList(); - + public void configurationAdded(ConsoleConfiguration root) { added.add(root); } public void sessionFactoryBuilt(ConsoleConfiguration ccfg, SessionFactory builtFactory) { - fail(Messages.KNOWNCONFIGURATIONSTEST_NO_SF_SHOULD_BE_BUILD); + fail(ConsoleTestMessages.KnownConfigurationsTest_no_sf_should_be_build); } public void sessionFactoryClosing(ConsoleConfiguration configuration, SessionFactory closingFactory) { - fail(Messages.KNOWNCONFIGURATIONSTEST_NO_SF_SHOULD_BE_CLOSED); + fail(ConsoleTestMessages.KnownConfigurationsTest_no_sf_should_be_closed); } public void configurationRemoved(ConsoleConfiguration root, boolean forUpdate) { if(!added.remove(root)) { - fail(Messages.KNOWNCONFIGURATIONSTEST_TRYING_REMOVE_NON_EXISTING_CONSOLE); + fail(ConsoleTestMessages.KnownConfigurationsTest_trying_remove_non_existing_console); } } } - + public void testKnownConfigurations() { - + KnownConfigurations knownConfigurations = KnownConfigurations.getInstance(); ConsoleConfiguration[] configurations = knownConfigurations.getConfigurations(); - + assertEquals(0, configurations.length); - - + + CCListener listener = new CCListener(); try { knownConfigurations.addConsoleConfigurationListener(listener); - + assertEquals(0, listener.added.size()); - + ConsoleConfigurationPreferences preferences = new ConsoleConfigurationPreferences() { - + public void setName(String name) { // TODO Auto-generated method stub - + } - + public void readStateFrom(Element element) { // TODO Auto-generated method stub - + } - + public void writeStateTo(Element node) { // TODO Auto-generated method stub - + } - + public File getPropertyFile() { // TODO Auto-generated method stub return null; } - + public File getConfigXMLFile() { // TODO Auto-generated method stub return null; } - + public Properties getProperties() { // TODO Auto-generated method stub return null; } - + public File[] getMappingFiles() { // TODO Auto-generated method stub return null; } - + public URL[] getCustomClassPathURLS() { // TODO Auto-generated method stub return null; } - + public String getName() { - return Messages.KNOWNCONFIGURATIONSTEST_FAKE_PREFS; + return ConsoleTestMessages.KnownConfigurationsTest_fake_prefs; } - + public boolean useAnnotations() { // TODO Auto-generated method stub return false; @@ -128,56 +128,56 @@ // TODO Auto-generated method stub return null; } - + }; - + ConsoleConfigurationPreferences preferences2 = new ConsoleConfigurationPreferences() { - - String name = Messages.KNOWNCONFIGURATIONSTEST_NEW_TEST; - + + String name = ConsoleTestMessages.KnownConfigurationsTest_new_test; + public void setName(String name) { this.name = name; } - + public void readStateFrom(Element element) { // TODO Auto-generated method stub - + } - + public void writeStateTo(Element node) { // TODO Auto-generated method stub - + } - + public File getPropertyFile() { // TODO Auto-generated method stub return null; } - + public File getConfigXMLFile() { // TODO Auto-generated method stub return null; } - + public Properties getProperties() { // TODO Auto-generated method stub return null; } - + public File[] getMappingFiles() { // TODO Auto-generated method stub return null; } - + public URL[] getCustomClassPathURLS() { // TODO Auto-generated method stub return null; } - + public String getName() { return name; } - + public boolean useAnnotations() { // TODO Auto-generated method stub return false; @@ -202,29 +202,29 @@ // TODO Auto-generated method stub return null; } - + }; ConsoleConfiguration configuration = new ConsoleConfiguration(preferences); ConsoleConfiguration configuration2 = new ConsoleConfiguration(preferences2); - + knownConfigurations.addConfiguration(configuration, false); knownConfigurations.addConfiguration(configuration2, false); - + configurations = knownConfigurations.getConfigurations(); assertEquals(2,configurations.length); assertEquals(listener.added.size(), 0); - + knownConfigurations.addConfiguration(configuration, true); knownConfigurations.addConfiguration(configuration2, true); - + configurations = knownConfigurations.getConfigurations(); - assertEquals(2,configurations.length); + assertEquals(2,configurations.length); assertEquals(listener.added.size(), 2); - + knownConfigurations.removeConfiguration(configuration, false); knownConfigurations.removeConfiguration(configuration2, false); - + configurations = knownConfigurations.getConfigurations(); assertEquals(0,configurations.length); assertEquals(listener.added.size(), 0); @@ -232,5 +232,5 @@ KnownConfigurations.getInstance().removeConfigurationListener(listener); } } - + } Deleted: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/Messages.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/Messages.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/Messages.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -1,35 +0,0 @@ -package org.hibernate.eclipse.console.test; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.hibernate.eclipse.console.test.messages"; //$NON-NLS-1$ - public static String BEANSHELLINTEGRATIONTEST_RESULT; - public static String CONSOLECONFIGTEST_FACTORY_ALREADY_EXISTS; - public static String CONSOLECONFIGTEST_FAKE_PREFS; - public static String CONSOLEPLUGINALLTESTS_TEST_FOR; - public static String HIBERNATECONSOLETEST_LONG_RUNNING_TASK_DETECTED; - public static String KNOWNCONFIGURATIONSTEST_FAKE_PREFS; - public static String KNOWNCONFIGURATIONSTEST_NEW_TEST; - public static String KNOWNCONFIGURATIONSTEST_NO_SF_SHOULD_BE_BUILD; - public static String KNOWNCONFIGURATIONSTEST_NO_SF_SHOULD_BE_CLOSED; - public static String KNOWNCONFIGURATIONSTEST_TRYING_REMOVE_NON_EXISTING_CONSOLE; - public static String PERSPECTIVETEST_HIBERNATE; - public static String REFACTORINGTEST_CATEGORY; - public static String REFACTORINGTEST_COREEXCEPTION_OCCURED_WORK_WITH_MEMENTO; - public static String REFACTORINGTEST_EXCEPTION_WHILE_FILENAMECHANGE_REFACTOR; - public static String REFACTORINGTEST_EXCEPTION_WHILE_FINDCHANGE_LAUNCH_CONFIG_PROCESSING; - public static String REFACTORINGTEST_EXCEPTION_WHILE_PACKNAMECHANGE_REFACTOR; - public static String REFACTORINGTEST_EXCEPTION_WHILE_PROJNAMECHANGE_REFACTOR; - public static String REFACTORINGTEST_EXCEPTION_WHILE_SRCNAMECHANGE_REFACTOR; - public static String REFACTORINGTEST_METHOD_NOT_TESTED; - public static String REFACTORINGTEST_SEGMENTNUM_TOO_MATCH; - public static String REFACTORINGTEST_TEST_LAUNCH_CONFIG; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/PerspectiveTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/PerspectiveTest.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/PerspectiveTest.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -8,13 +8,13 @@ public PerspectiveTest(String name) { super( name ); } - + public void testEnableHibernateProject() { IPerspectiveDescriptor perspective = PlatformUI.getWorkbench() .getActiveWorkbenchWindow().getActivePage().getPerspective(); - assertEquals(perspective.getLabel(), Messages.PERSPECTIVETEST_HIBERNATE); + assertEquals(perspective.getLabel(), ConsoleTestMessages.PerspectiveTest_hibernate); } } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -44,22 +44,22 @@ * */ public class RefactoringTest extends TestCase { - + private final String[] oldPathElements = new String[]{"oldPrj","oldSrc", "oldPack", "oldHibernate.cfg.xml"}; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ private final String[] newPathElements = new String[]{"newPrj","newSrc", "newPack", "newHibernate.cfg.xml"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - + SimpleTestProject project = null; - + private TestLaunchConfig testStrConfig = null; private TestLaunchConfig testStrListConfig = null; private TestLaunchConfig testNotChangedConfig = null; - - + + private IRuntimeClasspathEntry[] runtimeClasspathEntries = null; private int[] affectSegmentsCount = null; // shows how much segments should affect path - + private String oldPathStr = null; - + @Override protected void setUp() throws Exception { oldPathStr = oldPathElements[0]; @@ -71,20 +71,20 @@ Map<String, Object> testStrAttr = new HashMap<String, Object>(); Map<String, Object> testStrListAttr = new HashMap<String, Object>(); Map<String, Object> testNotChangedAttr = new HashMap<String, Object>(); - + testStrAttr.put(IConsoleConfigurationLaunchConstants.CFG_XML_FILE, oldPathStr); - + testStrListAttr.put(IConsoleConfigurationLaunchConstants.FILE_MAPPINGS, Arrays.asList(new String[]{oldPathStr})); - + testNotChangedAttr.put(IConsoleConfigurationLaunchConstants.CFG_XML_FILE, notChangedPathStr); testNotChangedAttr.put(IConsoleConfigurationLaunchConstants.FILE_MAPPINGS, Arrays.asList(new String[]{notChangedPathStr})); - + testStrConfig = new TestLaunchConfig(testStrAttr); testStrListConfig = new TestLaunchConfig(testStrListAttr); testNotChangedConfig = new TestLaunchConfig(testNotChangedAttr); project = new SimpleTestProject(oldPathElements[0]); IJavaProject proj = project.getIJavaProject(); - + { //initialize IRuntimeClassPathEntry[] and affectSegmentsCount for it runtimeClasspathEntries = new IRuntimeClasspathEntry[5]; affectSegmentsCount = new int[runtimeClasspathEntries.length]; @@ -93,7 +93,7 @@ affectSegmentsCount[2] = 1; affectSegmentsCount[3] = 2; affectSegmentsCount[4] = oldPathElements.length - 1; //all changes - + runtimeClasspathEntries[0] = new DefaultProjectClasspathEntry(proj);//project runtimeClasspathEntries[1] = new RuntimeClasspathEntry( JavaCore.newProjectEntry(generateOldPathForSegment(affectSegmentsCount[1]).makeAbsolute())); runtimeClasspathEntries[2] = new RuntimeClasspathEntry( JavaCore.newVariableEntry(generateOldPathForSegment(affectSegmentsCount[2]).makeAbsolute(), null, null)); @@ -101,7 +101,7 @@ runtimeClasspathEntries[4] = new RuntimeClasspathEntry( JavaCore.newLibraryEntry(generateOldPathForSegment(affectSegmentsCount[4]).makeAbsolute(), null, null)); } } - + public void testFindChanged(){ for (int i = 0; i < oldPathElements.length - 1; i++) { IPath oldPathPart = generateOldPathForSegment(i); @@ -110,11 +110,11 @@ assertTrue(HibernateRefactoringUtil.isConfigurationAffected(testStrListConfig, oldPathPart)); assertFalse(HibernateRefactoringUtil.isConfigurationAffected(testNotChangedConfig, oldPathPart)); } catch (CoreException e) { - fail(Messages.REFACTORINGTEST_EXCEPTION_WHILE_FINDCHANGE_LAUNCH_CONFIG_PROCESSING + e.getMessage()); - } + fail(ConsoleTestMessages.RefactoringTest_exception_while_findchange_launch_config_processing + e.getMessage()); + } } } - + public void testClassPathChanges(){ for (int i = 0; i < oldPathElements.length - 1; i++) { IPath oldPathPart = generateOldPathForSegment(i); @@ -132,55 +132,55 @@ String newMemento = newMementos.get(0); checkMementoChanged(oldMemento, newMemento, oldPathPart, newPath); } catch (CoreException e) { - fail(Messages.REFACTORINGTEST_COREEXCEPTION_OCCURED_WORK_WITH_MEMENTO + e.getMessage()); + fail(ConsoleTestMessages.RefactoringTest_coreexception_occurred_work_with_memento + e.getMessage()); } } else { assertFalse(HibernateRefactoringUtil.isRuntimeClassPathEntriesAffected(new IRuntimeClasspathEntry[]{runtimeClasspathEntries[j]}, oldPathPart)); } } - } + } } - + public void testProjectNameChange(){ int segmentNum = 0; try { updatePaths(generateOldPathForSegment(segmentNum), generateNewPathForSegment(segmentNum)); checkPaths(generateTruePathForSegment(segmentNum)); } catch (CoreException e) { - fail(Messages.REFACTORINGTEST_EXCEPTION_WHILE_PROJNAMECHANGE_REFACTOR); + fail(ConsoleTestMessages.RefactoringTest_exception_while_projnamechange_refactor); } } - + public void testSrcNameChange(){ int segmentNum = 1; try { updatePaths(generateOldPathForSegment(segmentNum), generateNewPathForSegment(segmentNum)); checkPaths(generateTruePathForSegment(segmentNum)); } catch (CoreException e) { - fail(Messages.REFACTORINGTEST_EXCEPTION_WHILE_SRCNAMECHANGE_REFACTOR); + fail(ConsoleTestMessages.RefactoringTest_exception_while_srcnamechange_refactor); } } - + public void testPackNameChange(){ int segmentNum = 2; try { updatePaths(generateOldPathForSegment(segmentNum), generateNewPathForSegment(segmentNum)); checkPaths(generateTruePathForSegment(segmentNum)); } catch (CoreException e) { - fail(Messages.REFACTORINGTEST_EXCEPTION_WHILE_PACKNAMECHANGE_REFACTOR); + fail(ConsoleTestMessages.RefactoringTest_exception_while_packnamechange_refactor); } } - + public void testFileNameChange(){ int segmentNum = 3; try { updatePaths(generateOldPathForSegment(segmentNum), generateNewPathForSegment(segmentNum)); checkPaths(generateTruePathForSegment(segmentNum)); } catch (CoreException e) { - fail(Messages.REFACTORINGTEST_EXCEPTION_WHILE_FILENAMECHANGE_REFACTOR); + fail(ConsoleTestMessages.RefactoringTest_exception_while_filenamechange_refactor); } } - + /* (non-Javadoc) * @see junit.framework.TestCase#tearDown() */ @@ -188,12 +188,12 @@ protected void tearDown() throws Exception { project.deleteIProject(); } - + private void updatePaths(Path oldPath, Path newPath) throws CoreException{ HibernateRefactoringUtil.updateLaunchConfig(testStrConfig, oldPath, newPath); HibernateRefactoringUtil.updateLaunchConfig(testStrListConfig, oldPath, newPath); } - + private void checkMementoChanged(String oldMemento, String newMemento, IPath oldPathPart, IPath newPath){ /* * /myProj/mySrc, \myProj\mySrc, myProj/mySrc, myProj\mySrc, myProj/mySrc/, myProj\mySrc\ @@ -207,7 +207,7 @@ if (newPathStr.charAt(newPathStr.length() - 1) == '/') newPathStr = newPathStr.substring(0 , newPathStr.length() - 1); oldPathStr = oldPathStr.replaceAll("/", "[\\\\,/]?"); //$NON-NLS-1$ //$NON-NLS-2$ newPathStr = newPathStr.replaceAll("/", "[\\\\,/]?"); //$NON-NLS-1$//$NON-NLS-2$ - + int count_old = 0; int count_new = 0; int last_index = 0; @@ -228,16 +228,16 @@ } assertTrue(count_new == count_old); } - + private void checkPaths(Path truePath) throws CoreException{ String newPath = (String) testStrConfig.getNewAttribute(IConsoleConfigurationLaunchConstants.CFG_XML_FILE); assertEquals(truePath.makeAbsolute(), new Path(newPath).makeAbsolute()); newPath = (String) ((List) testStrListConfig.getNewAttribute(IConsoleConfigurationLaunchConstants.FILE_MAPPINGS)).get(0); assertEquals(truePath.makeAbsolute(), new Path(newPath).makeAbsolute()); } - + private Path generateNewPathForSegment(int segmentNum){ - assertTrue(Messages.REFACTORINGTEST_SEGMENTNUM_TOO_MATCH, segmentNum < oldPathElements.length); + assertTrue(ConsoleTestMessages.RefactoringTest_segmentnum_too_match, segmentNum < oldPathElements.length); String newPath = ""; //$NON-NLS-1$ for (int i = 0; i < segmentNum; i++) { newPath += oldPathElements[i] + "/"; //$NON-NLS-1$ @@ -245,18 +245,18 @@ newPath += newPathElements[segmentNum]; return new Path(newPath); } - + private Path generateOldPathForSegment(int segmentNum){ - assertTrue(Messages.REFACTORINGTEST_SEGMENTNUM_TOO_MATCH, segmentNum < oldPathElements.length); + assertTrue(ConsoleTestMessages.RefactoringTest_segmentnum_too_match, segmentNum < oldPathElements.length); String oldPathPart = ""; //$NON-NLS-1$ for (int i = 0; i <= segmentNum; i++) { oldPathPart += oldPathElements[i] + "/"; //$NON-NLS-1$ } return new Path(oldPathPart); } - + private Path generateTruePathForSegment(int segmentNum){ - assertTrue(Messages.REFACTORINGTEST_SEGMENTNUM_TOO_MATCH, segmentNum < oldPathElements.length); + assertTrue(ConsoleTestMessages.RefactoringTest_segmentnum_too_match, segmentNum < oldPathElements.length); String newPath = ""; //$NON-NLS-1$ for (int i = 0; i < oldPathElements.length; i++) { if (i != segmentNum){ @@ -266,14 +266,14 @@ } return new Path(newPath); } - -//==================================================================================== + +//==================================================================================== class TestWorkingCopy implements ILaunchConfigurationWorkingCopy{ - + private TestLaunchConfig parent; - + private Map<String, Object> attributes = new HashMap<String, Object>(); - + TestWorkingCopy(TestLaunchConfig parent){ this.parent = parent; } @@ -287,23 +287,23 @@ public boolean hasAttribute(String attributeName) throws CoreException { - fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED); + fail(ConsoleTestMessages.RefactoringTest_method_not_tested); return false; } - + public Object removeAttribute(String attributeName) { - fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED); + fail(ConsoleTestMessages.RefactoringTest_method_not_tested); return null; } - public ILaunchConfiguration getOriginal() { + public ILaunchConfiguration getOriginal() { return parent; } - public ILaunchConfigurationWorkingCopy getParent() { + public ILaunchConfigurationWorkingCopy getParent() { return null; } - public boolean isDirty() { + public boolean isDirty() { return true; } @@ -321,66 +321,66 @@ attributes.put(attributeName, value); } - public void setAttribute(String attributeName, Map value) {fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED);} + public void setAttribute(String attributeName, Map value) {fail(ConsoleTestMessages.RefactoringTest_method_not_tested);} - public void setAttribute(String attributeName, boolean value) {fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED);} + public void setAttribute(String attributeName, boolean value) {fail(ConsoleTestMessages.RefactoringTest_method_not_tested);} - public void setAttributes(Map attributes) { fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED);} + public void setAttributes(Map attributes) { fail(ConsoleTestMessages.RefactoringTest_method_not_tested);} - public void setContainer(IContainer container) {fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED);} + public void setContainer(IContainer container) {fail(ConsoleTestMessages.RefactoringTest_method_not_tested);} - public void setMappedResources(IResource[] resources) {fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED);} + public void setMappedResources(IResource[] resources) {fail(ConsoleTestMessages.RefactoringTest_method_not_tested);} - public void setModes(Set modes) {fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED);} + public void setModes(Set modes) {fail(ConsoleTestMessages.RefactoringTest_method_not_tested);} - public void setPreferredLaunchDelegate(Set modes, String delegateId) {fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED);} + public void setPreferredLaunchDelegate(Set modes, String delegateId) {fail(ConsoleTestMessages.RefactoringTest_method_not_tested);} - public boolean contentsEqual(ILaunchConfiguration configuration) { + public boolean contentsEqual(ILaunchConfiguration configuration) { return false; } public ILaunchConfigurationWorkingCopy copy(String name) throws CoreException { - fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED); + fail(ConsoleTestMessages.RefactoringTest_method_not_tested); return null; } public void delete() throws CoreException {} - public boolean exists() { + public boolean exists() { return false; } public boolean getAttribute(String attributeName, boolean defaultValue) - throws CoreException { + throws CoreException { return parent.getAttribute(attributeName, defaultValue); } public int getAttribute(String attributeName, int defaultValue) - throws CoreException { - fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED); + throws CoreException { + fail(ConsoleTestMessages.RefactoringTest_method_not_tested); return 0; } public List getAttribute(String attributeName, List defaultValue) - throws CoreException { + throws CoreException { return parent.getAttribute(attributeName, defaultValue); } public Set getAttribute(String attributeName, Set defaultValue) - throws CoreException { - fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED); + throws CoreException { + fail(ConsoleTestMessages.RefactoringTest_method_not_tested); return null; } public Map getAttribute(String attributeName, Map defaultValue) - throws CoreException { - fail(Messages.REFACTORINGTEST_METHOD_NOT_TESTED); + throws CoreException { + fail(ConsoleTestMessages.RefactoringTest_method_not_tested); return null; } public String getAttribute(String attributeName, String defaultValue) - throws CoreException { + throws CoreException { return parent.getAttribute(attributeName, defaultValue); } @@ -388,102 +388,102 @@ return attributes; } - public String getCategory() throws CoreException { + public String getCategory() throws CoreException { return parent.getCategory(); } - public IFile getFile() { + public IFile getFile() { return null; } - public IPath getLocation() { + public IPath getLocation() { return null; } - public IResource[] getMappedResources() throws CoreException { + public IResource[] getMappedResources() throws CoreException { return null; } - public String getMemento() throws CoreException { + public String getMemento() throws CoreException { return null; } - public Set getModes() throws CoreException { + public Set getModes() throws CoreException { return null; } - public String getName() { + public String getName() { return null; } public ILaunchDelegate getPreferredDelegate(Set modes) - throws CoreException { + throws CoreException { return null; } - public ILaunchConfigurationType getType() throws CoreException { + public ILaunchConfigurationType getType() throws CoreException { return null; } public ILaunchConfigurationWorkingCopy getWorkingCopy() - throws CoreException { + throws CoreException { return null; } - public boolean isLocal() { + public boolean isLocal() { return false; } - public boolean isMigrationCandidate() throws CoreException { + public boolean isMigrationCandidate() throws CoreException { return false; } - public boolean isReadOnly() { + public boolean isReadOnly() { return false; } - public boolean isWorkingCopy() { + public boolean isWorkingCopy() { return false; } public ILaunch launch(String mode, IProgressMonitor monitor) - throws CoreException { + throws CoreException { return null; } public ILaunch launch(String mode, IProgressMonitor monitor, - boolean build) throws CoreException { + boolean build) throws CoreException { return null; } public ILaunch launch(String mode, IProgressMonitor monitor, - boolean build, boolean register) throws CoreException { + boolean build, boolean register) throws CoreException { return null; } public void migrate() throws CoreException {} - public boolean supportsMode(String mode) throws CoreException { + public boolean supportsMode(String mode) throws CoreException { return false; } - public Object getAdapter(Class adapter) { + public Object getAdapter(Class adapter) { return null; } - + } - + class TestLaunchConfig implements ILaunchConfiguration{ - + private Map<String, Object> attributes = new HashMap<String, Object>(); - + public Map<String, Object> updatedAttributes = new HashMap<String, Object>(); - + // returns updated attribute public Object getNewAttribute(String attributeName){ - return updatedAttributes.get(attributeName); + return updatedAttributes.get(attributeName); } - + TestLaunchConfig(Map<String, Object> attributes){ if (attributes != null){ this.attributes = attributes; @@ -500,7 +500,7 @@ } public void delete() throws CoreException { - + } public boolean exists() { @@ -520,7 +520,7 @@ throws CoreException { return attributes.containsKey(attributeName); } - + public int getAttribute(String attributeName, int defaultValue) throws CoreException { if (attributes.containsKey(attributeName)){ @@ -556,14 +556,14 @@ } else { return defaultValue; } - } + } public Map getAttributes() throws CoreException { return null; } public String getCategory() throws CoreException { - return Messages.REFACTORINGTEST_CATEGORY; + return ConsoleTestMessages.RefactoringTest_category; } public IFile getFile() { @@ -587,7 +587,7 @@ } public String getName() { - return Messages.REFACTORINGTEST_TEST_LAUNCH_CONFIG; + return ConsoleTestMessages.RefactoringTest_test_launch_config; } public ILaunchDelegate getPreferredDelegate(Set modes) @@ -636,7 +636,7 @@ } public void migrate() throws CoreException { - + } public boolean supportsMode(String mode) throws CoreException { @@ -646,8 +646,8 @@ public Object getAdapter(Class adapter) { return null; } - - + + }; } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -29,17 +29,18 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.hibernate.eclipse.console.HibernateConsolePerspectiveFactory; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; public class HibernateAllMappingTests extends TestCase { private MappingTestProject project; - + private static IPackageFragment activePackage; public HibernateAllMappingTests(String name) { super(name); } - + private TestResult result = null; protected void setUp() throws Exception { @@ -48,22 +49,22 @@ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().setPerspective( PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId("org.eclipse.ui.resourcePerspective")); //$NON-NLS-1$ - - IPackagesViewPart packageExplorer = null; + + IPackagesViewPart packageExplorer = null; try { packageExplorer = (IPackagesViewPart) PlatformUI.getWorkbench() .getActiveWorkbenchWindow().getActivePage().showView(JavaUI.ID_PACKAGES); } catch (PartInitException e) { throw new RuntimeException(e); } - + packageExplorer.selectAndReveal(project.getIJavaProject()); - + PlatformUI.getWorkbench() .getActiveWorkbenchWindow().getActivePage().setPerspective( PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId(HibernateConsolePerspectiveFactory.ID_CONSOLE_PERSPECTIVE)); - + waitForJobs(); runTestsAfterSetup(); ProjectUtil.createConsoleCFG(); @@ -82,13 +83,13 @@ */ @Override public void run(TestResult result) { - this.result = result; + this.result = result; super.run(result); - } - - public void tearDown() throws Exception { + } + + public void tearDown() throws Exception { waitForJobs(); - runTestsBeforeTearDown(); + runTestsBeforeTearDown(); waitForJobs(); delay(1000); //this.project.deleteIProject(); @@ -100,13 +101,13 @@ TestSuite suite = TestSetBeforeTearDown.getTests(); for (int i = 0; i < suite.testCount(); i++) { Test test = suite.testAt(i); - test.run(result); - } + test.run(result); + } } /** * Process UI input but do not return for the specified time interval. - * + * * @param waitTimeMillis * the number of milliseconds */ @@ -142,16 +143,16 @@ while (Platform.getJobManager().currentJob() != null) delay(1000); } - + protected MappingTestProject getProject() { return this.project; - } - + } + public void testEachPackWithTestSet() throws JavaModelException { long start_time = System.currentTimeMillis(); TestSuite suite = TestSet.getTests(); int pack_count = 0; - IPackageFragmentRoot[] roots = project.getIJavaProject().getAllPackageFragmentRoots(); + IPackageFragmentRoot[] roots = project.getIJavaProject().getAllPackageFragmentRoots(); for (int i = 0; i < roots.length; i++) { if (roots[i].getClass() != PackageFragmentRoot.class) continue; PackageFragmentRoot packageFragmentRoot = (PackageFragmentRoot) roots[i]; @@ -166,15 +167,15 @@ !Pattern.matches(Customization.TEST_PACKS_PATTERN, javaElement.getElementName())){ continue; } - - long st_pack_time = System.currentTimeMillis(); - int prev_failCount = result.failureCount(); + + long st_pack_time = System.currentTimeMillis(); + int prev_failCount = result.failureCount(); int prev_errCount = result.errorCount(); if (Customization.SHOW_EACH_TEST) suite = TestSet.getTests(); - + activePackage = pack; - //============================== + //============================== //run all tests for package for (int k = 0; k < suite.testCount(); k++) { Test test = suite.testAt(k); @@ -184,32 +185,32 @@ //============================== pack_count++; if (Customization.USE_CONSOLE_OUTPUT){ - System.out.print( result.errorCount() - prev_errCount + Messages.HIBERNATEALLMAPPINGTESTS_ERRORS + " \t"); //$NON-NLS-1$ - System.out.print( result.failureCount() - prev_failCount + Messages.HIBERNATEALLMAPPINGTESTS_FAILS + "\t"); //$NON-NLS-1$ + System.out.print( result.errorCount() - prev_errCount + ConsoleTestMessages.HibernateAllMappingTests_errors + " \t"); //$NON-NLS-1$ + System.out.print( result.failureCount() - prev_failCount + ConsoleTestMessages.HibernateAllMappingTests_fails + "\t"); //$NON-NLS-1$ long period = System.currentTimeMillis() - st_pack_time; String time = period / 1000 + "." + (period % 1000) / 100; //$NON-NLS-1$ - System.out.println( time +Messages.HIBERNATEALLMAPPINGTESTS_SECONDS + javaElement.getElementName()); + System.out.println( time +ConsoleTestMessages.HibernateAllMappingTests_seconds + javaElement.getElementName()); } waitForJobs(); delay(Customization.EACTH_PACK_TEST_DELAY); - + if (Customization.STOP_AFTER_MISSING_PACK){ if (result.failureCount() > prev_failCount) break; } prev_failCount = result.failureCount(); prev_errCount = result.errorCount(); - } - } + } + } } if (Customization.USE_CONSOLE_OUTPUT){ System.out.println( "====================================================="); //$NON-NLS-1$ - System.out.print( result.errorCount() + Messages.HIBERNATEALLMAPPINGTESTS_ERRORS + " \t"); //$NON-NLS-1$ - System.out.print( result.failureCount() + Messages.HIBERNATEALLMAPPINGTESTS_FAILS + "\t"); //$NON-NLS-1$ - System.out.print(( System.currentTimeMillis() - start_time ) / 1000 + Messages.HIBERNATEALLMAPPINGTESTS_SECONDS + "\t" ); //$NON-NLS-1$ - System.out.println( pack_count + Messages.HIBERNATEALLMAPPINGTESTS_PACKAGES_TESTED ); + System.out.print( result.errorCount() + ConsoleTestMessages.HibernateAllMappingTests_errors + " \t"); //$NON-NLS-1$ + System.out.print( result.failureCount() + ConsoleTestMessages.HibernateAllMappingTests_fails + "\t"); //$NON-NLS-1$ + System.out.print(( System.currentTimeMillis() - start_time ) / 1000 + ConsoleTestMessages.HibernateAllMappingTests_seconds + "\t" ); //$NON-NLS-1$ + System.out.println( pack_count + ConsoleTestMessages.HibernateAllMappingTests_packages_tested ); } - waitForJobs(); - + waitForJobs(); + delay(Customization.AFTER_ALL_PACKS_DELAY); } @@ -220,4 +221,3 @@ return activePackage; } } - \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestProject.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -41,6 +41,8 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.core.PackageFragmentRoot; +import org.eclipse.osgi.util.NLS; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; import org.hibernate.eclipse.console.test.HibernateConsoleTestPlugin; @@ -49,23 +51,23 @@ * */ public class MappingTestProject{ - + public static final String SRC_FOLDER = "src"; //$NON-NLS-1$ - + public static final String LIB_FOLDER = "lib"; //$NON-NLS-1$ private static MappingTestProject singleton= null; - + private static final Path JRE_CONTAINER = new Path("org.eclipse.jdt.launching.JRE_CONTAINER"); //$NON-NLS-1$ - + public static String PROJECT_NAME = "MappingTestProject"; //$NON-NLS-1$ public static String RESOURCE_PATH = "res/project/"; //$NON-NLS-1$ - + private static FileFilter fileFilter = new FileFilter(){ public boolean accept(File pathname) { return !pathname.isDirectory(); }}; - + private static FileFilter dirFilter = new FileFilter(){ public boolean accept(File pathname) { //exclude ".svn" and other unnessesary folders @@ -73,22 +75,22 @@ if (LIB_FOLDER.equals(pathname.getName())) return false; return pathname.isDirectory(); }}; - + private static FileFilter jarFilter = new FileFilter(){ public boolean accept(File pathname) { return !pathname.isDirectory() || pathname.getName().endsWith(".jar"); //$NON-NLS-1$ }}; - + private IProject project; private IJavaProject javaProject; - + public static MappingTestProject getTestProject(){ if (singleton == null){ singleton = new MappingTestProject(); } return singleton; - } - + } + private MappingTestProject() { initialize(); } @@ -96,7 +98,7 @@ private void initialize(){ try{ buildBigTestProject(); - }catch(Exception e){ + }catch(Exception e){ throw new RuntimeException(e); } } @@ -104,34 +106,37 @@ public IProject getIProject(){ return this.project; } - + public IJavaProject getIJavaProject(){ return this.javaProject; } - + public void deleteIProject() throws CoreException { project.delete(true, true, null); } - + private void buildBigTestProject() throws JavaModelException, CoreException, IOException { project = buildNewProject(PROJECT_NAME); javaProject = buildJavaProject(project); - + IPath resourcePath = new Path(RESOURCE_PATH); File resourceFolder = resourcePath.toFile(); URL entry = HibernateConsoleTestPlugin.getDefault().getBundle().getEntry(RESOURCE_PATH); URL resProject = FileLocator.resolve(entry); String tplPrjLcStr= FileLocator.resolve(resProject).getFile(); resourceFolder = new File(tplPrjLcStr); - if (!resourceFolder.exists()) - throw new RuntimeException(Messages.MAPPINGTESTPROJECT_FOLDER + RESOURCE_PATH + Messages.MAPPINGTESTPROJECT_NOT_FOUND); - + if (!resourceFolder.exists()) { + String out = NLS.bind(ConsoleTestMessages.MappingTestProject_folder_not_found, + RESOURCE_PATH); + throw new RuntimeException(out); + } + IPackageFragmentRoot sourceFolder = createSourceFolder(project, javaProject); recursiveCopyFiles(resourceFolder, (IFolder) sourceFolder.getResource()); List<IPath> libs = copyLibs(resourceFolder); generateClassPath(libs, sourceFolder); project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - } + } private void recursiveCopyFiles(File src, IFolder dst){ File[] files = src.listFiles(fileFilter); @@ -147,9 +152,9 @@ } catch (CoreException e) { e.printStackTrace(); continue; - } + } } - + File[] dirs = src.listFiles(dirFilter); for (int i = 0; i < dirs.length; i++) { File dir = dirs[i]; @@ -162,39 +167,42 @@ e.printStackTrace(); continue; } - } + } } - - private List<IPath> copyLibs(File res) throws CoreException { + + private List<IPath> copyLibs(File res) throws CoreException { IFolder dst = project.getFolder(LIB_FOLDER); if (!dst.exists()){ dst.create(false, true, null); javaProject.getPackageFragmentRoot(dst); } - + File libFolder = new File(res.getAbsolutePath()+"/" + LIB_FOLDER); //$NON-NLS-1$ - if ( !libFolder.exists() ) - throw new RuntimeException(Messages.MAPPINGTESTPROJECT_FOLDER + RESOURCE_PATH + "/" + LIB_FOLDER + Messages.MAPPINGTESTPROJECT_NOT_FOUND); //$NON-NLS-1$ - - + if ( !libFolder.exists() ) { + String out = NLS.bind(ConsoleTestMessages.MappingTestProject_folder_not_found, + RESOURCE_PATH + "/" + LIB_FOLDER); //$NON-NLS-1$ + throw new RuntimeException(out); + } + + List<IPath> libs = new ArrayList<IPath>(); - + File[] files = libFolder.listFiles(jarFilter); for (int i = 0; i < files.length; i++) { File file = files[i]; if (!file.exists()) continue; IFile iFile = dst.getFile(file.getName()); try { - iFile.create(new FileInputStream(file), true, null); + iFile.create(new FileInputStream(file), true, null); libs.add(iFile.getFullPath()); } catch (FileNotFoundException e) { e.printStackTrace(); continue; - } - } + } + } return libs; } - + private void generateClassPath(List<IPath> libs, IPackageFragmentRoot sourceFolder) throws JavaModelException{ List<IClasspathEntry> entries = new ArrayList<IClasspathEntry>(); //entries.addAll(Arrays.asList(javaProject.getRawClasspath())); @@ -205,8 +213,8 @@ entries.add(JavaCore.newContainerEntry(JRE_CONTAINER)); javaProject.setRawClasspath(entries.toArray(new IClasspathEntry[0]), null); } - + private IProject buildNewProject(String projectName) { // get a project handle final IProject newProjectHandle = ResourcesPlugin.getWorkspace() @@ -240,7 +248,7 @@ } catch (CoreException ce) { throw new RuntimeException(ce); } - + javaProject.setOption(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_5); javaProject.setOption(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_5); javaProject.setOption(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_5); @@ -268,9 +276,9 @@ } return javaProject.getPackageFragmentRoot(folder); } - - + + /*private boolean removePackage(String name, IProject project, IJavaProject javaProject) { IFolder folder = project.getFolder("src"); @@ -283,17 +291,17 @@ return false; } return true; - } + } return false; } - + /*private IPackageFragment buildPackage(String name, IProject project, IJavaProject javaProject) throws CoreException { IPackageFragmentRoot sourceFolder = buildSourceFolder(project, javaProject); return sourceFolder.createPackageFragment(name, false, null); } - + private IType[] buildTypes(IProject project, IJavaProject javaProject, CompilationPack compPack) throws CoreException /*throws CoreException*/ //{ @@ -302,9 +310,9 @@ /*IPackageFragment jPack = buildPackage(compPack.getPack(), project, javaProject); ICompilationUnit cu = null;//jPack.createCompilationUnit(cuName, //"", false, null); - + List<IType> result = new ArrayList<IType>(); - + InputStream is; try { File[] files = compPack.getFiles(); @@ -313,31 +321,31 @@ is = new FileInputStream(files[i]); String fileBody = getStringFromStream(is); - //ASTParser parser = ASTParser.newParser(AST.JLS3); - //parser.setSource(fileBody.toCharArray()); + //ASTParser parser = ASTParser.newParser(AST.JLS3); + //parser.setSource(fileBody.toCharArray()); //CompilationUnit cu2 = (CompilationUnit) parser.createAST(null); String cuName = files[i].getName(); - + try { cu = jPack.createCompilationUnit(cuName, fileBody, false, null); result.addAll(Arrays.asList(cu.getAllTypes())); - } catch (JavaModelException e) { + } catch (JavaModelException e) { e.printStackTrace(); System.out.println("Error compiling file " + files[i].getAbsolutePath()); - } - } + } + } } } catch (FileNotFoundException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); - } + } for (int i = 0; i < result.size(); i++) { System.out.println(((IType)result.get(i)).getElementName()); - } + } return (IType[])result.toArray(new IType[0]); - } - + } + public static String getStringFromStream (InputStream is) throws IOException { @@ -356,28 +364,28 @@ if (null != is) is.close(); } } - + private void createCompilationPacks(File pack, List<CompilationPack> compPacks, String packName){ if (pack.isDirectory()){ if (packName.length() != 0) packName += '.'; packName += pack.getName(); - + File[] files = pack.listFiles(fileFilter); if (files.length > 0) compPacks.add(new CompilationPack(packName, files)); - + File[] dirs = pack.listFiles(dirFilter); for (int i = 0; i < dirs.length; i++) { createCompilationPacks(dirs[i], compPacks, packName); } } } - + public class CompilationPack { - + private String pack = null; - + private File[] files = null; - + CompilationPack (String pack, File[] files){ this.pack = pack; this.files = files; @@ -389,7 +397,7 @@ public File[] getFiles() { return files; - } + } }*/ } Deleted: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/Messages.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/Messages.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/Messages.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -1,44 +0,0 @@ -package org.hibernate.eclipse.console.test.mappingproject; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.hibernate.eclipse.console.test.mappingproject.messages"; //$NON-NLS-1$ - public static String HIBERNATEALLMAPPINGTESTS_ERRORS; - public static String HIBERNATEALLMAPPINGTESTS_FAILS; - public static String HIBERNATEALLMAPPINGTESTS_PACKAGES_TESTED; - public static String HIBERNATEALLMAPPINGTESTS_SECONDS; - public static String MAPPINGTESTPROJECT_FOLDER; - public static String MAPPINGTESTPROJECT_NOT_FOUND; - public static String OPENJAVAEDITORS_ERROR_OPENNING_COMPILATIONUNIT; - public static String OPENMAPPINGDIAGRAMTEST_CANNOT_BE_OPENED; - public static String OPENMAPPINGDIAGRAMTEST_MAPPING_DIAGRAMM_FOR; - public static String OPENMAPPINGDIAGRAMTEST_MAPPING_DIAGRAMMS_FOR_PACKAGE; - public static String OPENMAPPINGDIAGRAMTEST_NOT_OPENED; - public static String OPENMAPPINGFILETEST_CANNOT_BE_OPENED; - public static String OPENMAPPINGFILETEST_HIGHLIGHTED_REGION_FOR; - public static String OPENMAPPINGFILETEST_HIGHLIGHTED_REGION_FOR_PROPERTY; - public static String OPENMAPPINGFILETEST_IS_EMPTY_PACKAGE; - public static String OPENMAPPINGFILETEST_MAPPING_FILE_FOR; - public static String OPENMAPPINGFILETEST_MAPPING_FILE_FOR_PROPERTY; - public static String OPENMAPPINGFILETEST_MAPPING_FILES_FOR_PACKAGE; - public static String OPENMAPPINGFILETEST_NOT_OPENED_PACKAGE; - public static String OPENSOURCEFILETEST_CANNOT_BE_OPENED; - public static String OPENSOURCEFILETEST_HIGHLIGHTED_REGION_FOR; - public static String OPENSOURCEFILETEST_IS_EMPTY; - public static String OPENSOURCEFILETEST_MAPPING_FILE_FOR; - public static String OPENSOURCEFILETEST_NOT_OPENED; - public static String OPENSOURCEFILETEST_SOURCE_FILES_FOR_PACKAGE; - public static String PROJECTUTIL_CANNOT_GET_ERROR_FIELD_FROM_ERROREDITORPART; - public static String PROJECTUTIL_CANNOT_GET_EXCEPTION_FROM_ERROREDITORPART; - public static String TESTSET_TEST_FOR_MAPPINGTESTPROJECT; - public static String UPDATECONFIGURATIONTEST_ERROR_CUSTOMISING; - public static String UPDATECONFIGURATIONTEST_FILE_FOR_PACKAGE; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenJavaEditors.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -24,6 +24,7 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; /** * @author Dmitry Geraskov @@ -31,11 +32,11 @@ * just to test that our external Unit tests work right with MappingTestProject */ public class OpenJavaEditors extends TestCase { - + public void testOpenJavaEditor() throws JavaModelException { MappingTestProject mapProject = MappingTestProject.getTestProject(); - - IPackageFragmentRoot[] roots = mapProject.getIJavaProject().getAllPackageFragmentRoots(); + + IPackageFragmentRoot[] roots = mapProject.getIJavaProject().getAllPackageFragmentRoots(); for (int i = 0; i < roots.length; i++) { if (roots[i].getClass() != PackageFragmentRoot.class) continue; PackageFragmentRoot packageFragmentRoot = (PackageFragmentRoot) roots[i]; @@ -46,15 +47,15 @@ ICompilationUnit[] cus = ((IPackageFragment)javaElement).getCompilationUnits(); for (int k = 0; k < cus.length; k++) { ICompilationUnit compilationUnit = cus[k]; - FileEditorInput input = new FileEditorInput((IFile) compilationUnit.getCorrespondingResource()); + FileEditorInput input = new FileEditorInput((IFile) compilationUnit.getCorrespondingResource()); try { PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(input, JavaUI.ID_CU_EDITOR ); } catch (PartInitException e) { - fail(Messages.OPENJAVAEDITORS_ERROR_OPENNING_COMPILATIONUNIT + e.getMessage()); + fail(ConsoleTestMessages.OpenJavaEditors_error_openning_compilationunit + e.getMessage()); } } } - } + } } //PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false); Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -12,6 +12,7 @@ import junit.framework.TestCase; +import org.eclipse.osgi.util.NLS; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; import org.hibernate.InvalidMappingException; @@ -19,6 +20,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; import org.hibernate.eclipse.console.workbench.ConfigurationWorkbenchAdapter; import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkbenchAdapter; import org.hibernate.mapping.PersistentClass; @@ -41,29 +43,33 @@ assertTrue(configs[0] instanceof Configuration); persClasses = new ConfigurationWorkbenchAdapter().getChildren(configs[0]); } catch (InvalidMappingException ex){ - fail(Messages.OPENMAPPINGDIAGRAMTEST_MAPPING_DIAGRAMMS_FOR_PACKAGE + HibernateAllMappingTests.getActivePackage().getElementName() - + Messages.OPENMAPPINGDIAGRAMTEST_CANNOT_BE_OPENED + ex.getMessage()); + String out = NLS.bind(ConsoleTestMessages.OpenMappingDiagramTest_mapping_diagrams_for_package_cannot_be_opened, + new Object[]{HibernateAllMappingTests.getActivePackage().getElementName(), ex.getMessage()}); + fail(out); } - + if (persClasses.length > 0){ for (int i = 0; i < persClasses.length; i++) { assertTrue(persClasses[0] instanceof PersistentClass); PersistentClass persClass = (PersistentClass) persClasses[i]; - + IEditorPart editor = null; Throwable ex = null; try { editor = new OpenDiagramActionDelegate().openEditor(persClass, consCFG); } catch (PartInitException e) { ex = e; - } - if (ex == null ) ex = ProjectUtil.getExceptionIfItOccured(editor); - if (ex != null) fail(Messages.OPENMAPPINGDIAGRAMTEST_MAPPING_DIAGRAMM_FOR + persClass.getClassName() - + Messages.OPENMAPPINGDIAGRAMTEST_NOT_OPENED + ex.getMessage()); - } + } + if (ex == null ) ex = ProjectUtil.getExceptionIfItOccured(editor); + if (ex != null) { + String out = NLS.bind(ConsoleTestMessages.OpenMappingDiagramTest_mapping_diagram_for_not_opened, + new Object[]{persClass.getClassName(), ex.getMessage()}); + fail(out); + } + } } //close all editors } - + } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -19,6 +19,7 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.text.TextSelection; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.osgi.util.NLS; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.MultiPageEditorPart; @@ -28,6 +29,7 @@ import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; import org.hibernate.eclipse.console.actions.OpenMappingAction; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; import org.hibernate.eclipse.console.workbench.ConfigurationWorkbenchAdapter; import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkbenchAdapter; import org.hibernate.eclipse.console.workbench.PersistentClassWorkbenchAdapter; @@ -40,7 +42,7 @@ * */ public class OpenMappingFileTest extends TestCase { - + public void testOpenMappingFileTest() { KnownConfigurations knownConfigurations = KnownConfigurations.getInstance(); final ConsoleConfiguration consCFG = knownConfigurations.find(ProjectUtil.ConsoleCFGName); @@ -54,8 +56,9 @@ assertTrue(configs[0] instanceof Configuration); persClasses = new ConfigurationWorkbenchAdapter().getChildren(configs[0]); } catch (InvalidMappingException ex){ - fail(Messages.OPENMAPPINGFILETEST_MAPPING_FILES_FOR_PACKAGE + HibernateAllMappingTests.getActivePackage().getElementName() - + Messages.OPENMAPPINGFILETEST_CANNOT_BE_OPENED + ex.getMessage()); + String out = NLS.bind(ConsoleTestMessages.OpenMappingFileTest_mapping_files_for_package_cannot_be_opened, + new Object[]{HibernateAllMappingTests.getActivePackage().getElementName(), ex.getMessage()}); + fail(out); } if (persClasses.length > 0){ for (int i = 0; i < persClasses.length; i++) { @@ -77,16 +80,18 @@ } //close all editors } - + private void openPropertyTest(Property compositeProperty, Property parentProperty, ConsoleConfiguration consCFG){ IEditorPart editor = null; Throwable ex = null; try { editor = OpenMappingAction.run(compositeProperty, parentProperty, consCFG); boolean highlighted = ProjectUtil.checkHighlighting(editor); - if (!highlighted) - fail(Messages.OPENMAPPINGFILETEST_HIGHLIGHTED_REGION_FOR_PROPERTY + compositeProperty.getNodeName() + Messages.OPENMAPPINGFILETEST_IS_EMPTY_PACKAGE - + HibernateAllMappingTests.getActivePackage().getElementName() + ")"); //$NON-NLS-1$ + if (!highlighted) { + String out = NLS.bind(ConsoleTestMessages.OpenMappingFileTest_highlighted_region_for_property_is_empty_package, + new Object[]{compositeProperty.getNodeName(), HibernateAllMappingTests.getActivePackage().getElementName()}); + fail(out); + } Object[] compProperties = new PropertyWorkbenchAdapter().getChildren(compositeProperty); for (int k = 0; k < compProperties.length; k++) { //test Composite properties @@ -100,34 +105,42 @@ ex = e; } catch (FileNotFoundException e) { ex = e; - } + } if (ex == null ) ex = ProjectUtil.getExceptionIfItOccured(editor); - if (ex != null) fail(Messages.OPENMAPPINGFILETEST_MAPPING_FILE_FOR_PROPERTY + compositeProperty.getNodeName() + Messages.OPENMAPPINGFILETEST_NOT_OPENED_PACKAGE - + HibernateAllMappingTests.getActivePackage().getElementName() + ")\n" + ex.getMessage()); //$NON-NLS-1$ + if (ex != null) { + String out = NLS.bind(ConsoleTestMessages.OpenMappingFileTest_mapping_file_for_property_not_opened_package, + new Object[]{compositeProperty.getNodeName(), HibernateAllMappingTests.getActivePackage().getElementName(), ex.getMessage()}); + fail(out); + } } - + private void openTest(Object selection, ConsoleConfiguration consCFG){ IEditorPart editor = null; Throwable ex = null; try { editor = OpenMappingAction.run(selection, consCFG); boolean highlighted = ProjectUtil.checkHighlighting(editor); - if (!highlighted) - fail(Messages.OPENMAPPINGFILETEST_HIGHLIGHTED_REGION_FOR + selection + Messages.OPENMAPPINGFILETEST_IS_EMPTY_PACKAGE - + HibernateAllMappingTests.getActivePackage().getElementName() + ")"); //$NON-NLS-1$ + if (!highlighted) { + String out = NLS.bind(ConsoleTestMessages.OpenMappingFileTest_highlighted_region_for_is_empty_package, + new Object[]{selection, HibernateAllMappingTests.getActivePackage().getElementName()}); + fail(out); + } } catch (PartInitException e) { ex = e; } catch (JavaModelException e) { ex = e; } catch (FileNotFoundException e) { ex = e; - } + } if (ex == null ) ex = ProjectUtil.getExceptionIfItOccured(editor); - if (ex != null) fail(Messages.OPENMAPPINGFILETEST_MAPPING_FILE_FOR + selection + Messages.OPENMAPPINGFILETEST_NOT_OPENED_PACKAGE - + HibernateAllMappingTests.getActivePackage().getElementName() + ") :\n" + ex.getMessage()); //$NON-NLS-1$ + if (ex != null) { + String out = NLS.bind(ConsoleTestMessages.OpenMappingFileTest_mapping_file_for_not_opened_package, + new Object[]{selection, HibernateAllMappingTests.getActivePackage().getElementName(), ex.getMessage()}); + fail(out); + } } - - + + } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -15,6 +15,7 @@ import junit.framework.TestCase; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.osgi.util.NLS; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; import org.hibernate.InvalidMappingException; @@ -22,6 +23,7 @@ import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; import org.hibernate.eclipse.console.actions.OpenSourceAction; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; import org.hibernate.eclipse.console.workbench.ConfigurationWorkbenchAdapter; import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkbenchAdapter; import org.hibernate.eclipse.console.workbench.PersistentClassWorkbenchAdapter; @@ -35,7 +37,7 @@ * */ public class OpenSourceFileTest extends TestCase { - + public void testOpenSourceFileTest() { //fail("test fail"); KnownConfigurations knownConfigurations = KnownConfigurations.getInstance(); @@ -50,8 +52,9 @@ assertTrue(configs[0] instanceof Configuration); persClasses = new ConfigurationWorkbenchAdapter().getChildren(configs[0]); } catch (InvalidMappingException ex){ - fail(Messages.OPENSOURCEFILETEST_SOURCE_FILES_FOR_PACKAGE + HibernateAllMappingTests.getActivePackage().getElementName() - + Messages.OPENSOURCEFILETEST_CANNOT_BE_OPENED + ex.getMessage()); + String out = NLS.bind(ConsoleTestMessages.OpenSourceFileTest_source_files_for_package_cannot_be_opened, + HibernateAllMappingTests.getActivePackage().getElementName(), ex.getMessage()); + fail(out); } if (persClasses.length > 0){ for (int i = 0; i < persClasses.length; i++) { @@ -69,7 +72,7 @@ if (fields[j] instanceof Property && ((Property)fields[j]).isComposite()) { fullyQualifiedName =((Component)((Property) fields[j]).getValue()).getComponentClassName(); - + Object[] compProperties = new PropertyWorkbenchAdapter().getChildren(fields[j]); for (int k = 0; k < compProperties.length; k++) { if (compProperties[k].getClass() != Property.class) continue; @@ -83,27 +86,33 @@ //close all editors } - + private void openTest(Object selection, ConsoleConfiguration consCFG, String fullyQualifiedName){ IEditorPart editor = null; Throwable ex = null; try { - editor = new OpenSourceAction().run(selection, MappingTestProject.getTestProject().getIJavaProject(), + editor = new OpenSourceAction().run(selection, MappingTestProject.getTestProject().getIJavaProject(), fullyQualifiedName); boolean highlighted = ProjectUtil.checkHighlighting(editor); - if (!highlighted) fail(Messages.OPENSOURCEFILETEST_HIGHLIGHTED_REGION_FOR + selection + Messages.OPENSOURCEFILETEST_IS_EMPTY); + if (!highlighted) { + String out = NLS.bind(ConsoleTestMessages.OpenSourceFileTest_highlighted_region_for_is_empty, selection); + fail(out); + } } catch (PartInitException e) { ex = e; } catch (JavaModelException e) { ex = e; } catch (FileNotFoundException e) { ex = e; - } + } if (ex == null ) ex = ProjectUtil.getExceptionIfItOccured(editor); - if (ex != null) fail(Messages.OPENSOURCEFILETEST_MAPPING_FILE_FOR + fullyQualifiedName/*.getClassName()*/ - + Messages.OPENSOURCEFILETEST_NOT_OPENED + ex.getMessage()); + if (ex != null) { + String out = NLS.bind(ConsoleTestMessages.OpenSourceFileTest_mapping_file_for_not_opened, + fullyQualifiedName/*.getClassName()*/, ex.getMessage()); + fail(out); + } } - - + + } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -31,6 +31,7 @@ import org.eclipse.ui.part.MultiPageEditorPart; import org.eclipse.ui.texteditor.ITextEditor; import org.hibernate.console.preferences.ConsoleConfigurationPreferences; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; import org.hibernate.eclipse.console.wizards.ConsoleConfigurationCreationWizard; import org.hibernate.mapping.PersistentClass; @@ -39,26 +40,26 @@ * */ public class ProjectUtil { - + private static final StringBuilder XML_HEADER = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") //$NON-NLS-1$ .append("<!DOCTYPE hibernate-configuration PUBLIC\n") //$NON-NLS-1$ .append("\"-//Hibernate/Hibernate Configuration DTD 3.0//EN\"\n") //$NON-NLS-1$ .append("\"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd\">\n"); //$NON-NLS-1$ - + private static final StringBuilder XML_CFG_START = new StringBuilder("<hibernate-configuration>\n") //$NON-NLS-1$ .append("<session-factory>\n") //$NON-NLS-1$ .append("<property name=\"hibernate.dialect\">") //$NON-NLS-1$ .append(Customization.HIBERNATE_DIALECT) .append("</property>"); //$NON-NLS-1$ - + private static final StringBuilder XML_CFG_END = new StringBuilder("</session-factory>\n") //$NON-NLS-1$ .append("</hibernate-configuration>\n"); //$NON-NLS-1$ - - + + public static final String CFG_FILE_NAME = "hibernate.cfg.xml"; //$NON-NLS-1$ - + public static final String ConsoleCFGName = "testConfigName"; //$NON-NLS-1$ - + public static void customizeCFGFileForPack(IPackageFragment pack) throws CoreException{ IFolder srcFolder = (IFolder) pack.getParent().getResource(); IFile iFile = srcFolder.getFile(CFG_FILE_NAME); @@ -76,7 +77,7 @@ } } } - } + } /*if (pack.getCompilationUnits().length > 0){ ICompilationUnit[] comps = pack.getCompilationUnits(); for (int i = 0; i < comps.length; i++) { @@ -95,25 +96,25 @@ iFile.create(new StringInputStream(file_body), true, null); } - + public static String getPersistentClassName(PersistentClass persClass) { if (persClass == null) { return ""; //$NON-NLS-1$ - } else { + } else { return persClass.getEntityName() != null ? persClass.getEntityName() : persClass.getClassName(); } } - + public static void createConsoleCFG() throws CoreException{ new ConsoleConfigurationCreationWizard2().run(); } - + private static class ConsoleConfigurationCreationWizard2 extends ConsoleConfigurationCreationWizard{ - + public void run() throws CoreException { IPath cfgFilePath = new Path(MappingTestProject.PROJECT_NAME + "/" + //$NON-NLS-1$ MappingTestProject.SRC_FOLDER + "/" + ProjectUtil.CFG_FILE_NAME); //$NON-NLS-1$ - createConsoleConfiguration(null, null, ConsoleCFGName, ConsoleConfigurationPreferences.ConfigurationMode.CORE, + createConsoleConfiguration(null, null, ConsoleCFGName, ConsoleConfigurationPreferences.ConfigurationMode.CORE, MappingTestProject.PROJECT_NAME, true, "", //$NON-NLS-1$ null, cfgFilePath, new Path[0], new Path[0], "", "", new NullProgressMonitor()); //$NON-NLS-1$//$NON-NLS-2$ @@ -121,12 +122,12 @@ } /** * Sometimes we have exceptions while opening editors. - * IDE catches this exceptions and opens ErrorEditorPart instead of + * IDE catches this exceptions and opens ErrorEditorPart instead of * our editor. To be sure that editor opened without exception use this method. * It gets occurred exception from the editor if it was and passes it up. - * + * * @param editor - * @return + * @return * @throws Throwable */ public static Throwable getExceptionIfItOccured(IEditorPart editor){ @@ -135,9 +136,9 @@ Field field; try { field = clazz.getDeclaredField("error"); //$NON-NLS-1$ - + field.setAccessible(true); - + Object error = field.get(editor); if (error instanceof IStatus) { IStatus err_status = (IStatus) error; @@ -147,18 +148,18 @@ } // catch close means that exception occurred but we can't get it } catch (SecurityException e) { - return new RuntimeException(Messages.PROJECTUTIL_CANNOT_GET_EXCEPTION_FROM_ERROREDITORPART + e.getMessage()); + return new RuntimeException(ConsoleTestMessages.ProjectUtil_cannot_get_exception_from_erroreditorpart + e.getMessage()); } catch (NoSuchFieldException e) { - return new RuntimeException(Messages.PROJECTUTIL_CANNOT_GET_ERROR_FIELD_FROM_ERROREDITORPART + e.getMessage()); + return new RuntimeException(ConsoleTestMessages.ProjectUtil_cannot_get_error_field_from_erroreditorpart + e.getMessage()); } catch (IllegalArgumentException e) { - return new RuntimeException(Messages.PROJECTUTIL_CANNOT_GET_ERROR_FIELD_FROM_ERROREDITORPART + e.getMessage()); //$NON-NLS-1$ + return new RuntimeException(ConsoleTestMessages.ProjectUtil_cannot_get_error_field_from_erroreditorpart + e.getMessage()); } catch (IllegalAccessException e) { - return new RuntimeException(Messages.PROJECTUTIL_CANNOT_GET_ERROR_FIELD_FROM_ERROREDITORPART + e.getMessage()); //$NON-NLS-1$ + return new RuntimeException(ConsoleTestMessages.ProjectUtil_cannot_get_error_field_from_erroreditorpart + e.getMessage()); } } return null; } - + public static boolean checkHighlighting(IEditorPart editor){ ITextEditor[] tEditors = getTextEditors(editor); boolean highlighted = false; @@ -172,8 +173,8 @@ } return highlighted; } - - + + /** * Should be identical with OpenMappingAction.getTextEditors() * @param editorPart @@ -181,7 +182,7 @@ */ public static ITextEditor[] getTextEditors(IEditorPart editorPart) { if (editorPart instanceof MultiPageEditorPart) { - List testEditors = new ArrayList(); + List testEditors = new ArrayList(); IEditorPart[] editors = ((MultiPageEditorPart) editorPart).findEditors(editorPart.getEditorInput()); for (int i = 0; i < editors.length; i++) { if (editors[i] instanceof ITextEditor){ Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSet.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.hibernate.eclipse.console.test.mappingproject; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; + import junit.framework.TestSuite; /** @@ -18,31 +20,31 @@ */ public class TestSet{ - /** + /** * use only addTestSuit to prevent errors!!! * @return */ public static TestSuite getTests(){ - TestSuite suite = new TestSuite(Messages.TESTSET_TEST_FOR_MAPPINGTESTPROJECT ); - + TestSuite suite = new TestSuite(ConsoleTestMessages.TestSet_test_for_mappingtestproject); + addTestsPackSetUp( suite ); addPackTests( suite ); - addTestsPackTearDown( suite ); - + addTestsPackTearDown( suite ); + return suite; } - - - private static void addTestsPackSetUp(TestSuite suite){ + + + private static void addTestsPackSetUp(TestSuite suite){ suite.addTestSuite( UpdateConfigurationTest.class ); } - + private static void addPackTests(TestSuite suite){ suite.addTestSuite( OpenSourceFileTest.class ); suite.addTestSuite( OpenMappingFileTest.class ); suite.addTestSuite( OpenMappingDiagramTest.class ); } - + private static void addTestsPackTearDown(TestSuite suite){ suite.addTestSuite( CloseAllEditorsTest.class ); } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetAfterSetup.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -11,6 +11,8 @@ package org.hibernate.eclipse.console.test.mappingproject; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; + import junit.framework.TestSuite; /** @@ -19,7 +21,7 @@ */ public class TestSetAfterSetup { public static TestSuite getTests(){ - TestSuite suite = new TestSuite(Messages.TESTSET_TEST_FOR_MAPPINGTESTPROJECT ); + TestSuite suite = new TestSuite(ConsoleTestMessages.TestSet_test_for_mappingtestproject); suite.addTestSuite( HibernateNatureAddTest.class ); //suite.addTestSuite( CreateConsoleConfigTest.class ); return suite; Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/TestSetBeforeTearDown.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.hibernate.eclipse.console.test.mappingproject; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; + import junit.framework.TestSuite; /** @@ -18,9 +20,9 @@ */ public class TestSetBeforeTearDown { public static TestSuite getTests(){ - TestSuite suite = new TestSuite(Messages.TESTSET_TEST_FOR_MAPPINGTESTPROJECT ); + TestSuite suite = new TestSuite(ConsoleTestMessages.TestSet_test_for_mappingtestproject ); suite.addTestSuite( HibernateNatureRemoveTest.class ); - + return suite; } } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/UpdateConfigurationTest.java 2008-06-06 16:51:10 UTC (rev 8613) @@ -15,13 +15,15 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.osgi.util.NLS; +import org.hibernate.eclipse.console.test.ConsoleTestMessages; /** * @author Dmitry Geraskov * */ public class UpdateConfigurationTest extends TestCase { - + public void testUpdateConfiguration() throws JavaModelException{ //fail("test fail"); IPackageFragment pack = HibernateAllMappingTests.getActivePackage(); @@ -29,8 +31,9 @@ try { ProjectUtil.customizeCFGFileForPack(pack); } catch (CoreException e) { - fail(Messages.UPDATECONFIGURATIONTEST_ERROR_CUSTOMISING + ProjectUtil.CFG_FILE_NAME + Messages.UPDATECONFIGURATIONTEST_FILE_FOR_PACKAGE - + pack.getPath() + ".\n" + e.getMessage()); //$NON-NLS-1$ + String out = NLS.bind(ConsoleTestMessages.UpdateConfigurationTest_error_customising_file_for_package, + new Object[] { ProjectUtil.CFG_FILE_NAME, pack.getPath(), e.getMessage() } ); + fail(out); } } } Deleted: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/messages.properties =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/messages.properties 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/messages.properties 2008-06-06 16:51:10 UTC (rev 8613) @@ -1,30 +0,0 @@ -HIBERNATEALLMAPPINGTESTS_ERRORS=\ errors. -HIBERNATEALLMAPPINGTESTS_FAILS=\ fails. -HIBERNATEALLMAPPINGTESTS_PACKAGES_TESTED=\ packages tested. -HIBERNATEALLMAPPINGTESTS_SECONDS=\ sec. -MAPPINGTESTPROJECT_FOLDER=Folder -MAPPINGTESTPROJECT_NOT_FOUND=\ not found\! -OPENJAVAEDITORS_ERROR_OPENNING_COMPILATIONUNIT=Error opening CompilationUnit: -OPENMAPPINGDIAGRAMTEST_CANNOT_BE_OPENED=\ can't be opened:\n -OPENMAPPINGDIAGRAMTEST_MAPPING_DIAGRAMM_FOR=Mapping Diagramm for -OPENMAPPINGDIAGRAMTEST_MAPPING_DIAGRAMMS_FOR_PACKAGE=Mapping Diagramms for package -OPENMAPPINGDIAGRAMTEST_NOT_OPENED=\ not opened:\n -OPENMAPPINGFILETEST_CANNOT_BE_OPENED=\ can't be opened:\n -OPENMAPPINGFILETEST_HIGHLIGHTED_REGION_FOR=Highlighted region for -OPENMAPPINGFILETEST_HIGHLIGHTED_REGION_FOR_PROPERTY=Highlighted region for property -OPENMAPPINGFILETEST_IS_EMPTY_PACKAGE=\ is empty. (package -OPENMAPPINGFILETEST_MAPPING_FILE_FOR=Mapping file for -OPENMAPPINGFILETEST_MAPPING_FILE_FOR_PROPERTY=Mapping file for property -OPENMAPPINGFILETEST_MAPPING_FILES_FOR_PACKAGE=Mapping Files for package -OPENMAPPINGFILETEST_NOT_OPENED_PACKAGE=\ not opened: (package -OPENSOURCEFILETEST_CANNOT_BE_OPENED=\ can't be opened:\n -OPENSOURCEFILETEST_HIGHLIGHTED_REGION_FOR=Highlighted region for -OPENSOURCEFILETEST_IS_EMPTY=\ is empty. -OPENSOURCEFILETEST_MAPPING_FILE_FOR=Mapping file for -OPENSOURCEFILETEST_NOT_OPENED=\ not opened:\n -OPENSOURCEFILETEST_SOURCE_FILES_FOR_PACKAGE=Source files for package -PROJECTUTIL_CANNOT_GET_ERROR_FIELD_FROM_ERROREDITORPART=Can't get error field from ErrorEditorPart. -PROJECTUTIL_CANNOT_GET_EXCEPTION_FROM_ERROREDITORPART=Can't get exception from ErrorEditorPart. -TESTSET_TEST_FOR_MAPPINGTESTPROJECT=Test for MappingTestProject -UPDATECONFIGURATIONTEST_ERROR_CUSTOMISING=Error customising -UPDATECONFIGURATIONTEST_FILE_FOR_PACKAGE=\ file for package Deleted: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/messages.properties =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/messages.properties 2008-06-06 16:50:40 UTC (rev 8612) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/messages.properties 2008-06-06 16:51:10 UTC (rev 8613) @@ -1,21 +0,0 @@ -BEANSHELLINTEGRATIONTEST_RESULT=Result: -CONSOLECONFIGTEST_FACTORY_ALREADY_EXISTS=Should throw an exception because a factory already exists\! -CONSOLECONFIGTEST_FAKE_PREFS=fake prefs -CONSOLEPLUGINALLTESTS_TEST_FOR=Test for org.hibernate.eclipse.console.test -HIBERNATECONSOLETEST_LONG_RUNNING_TASK_DETECTED=A long running task detected -KNOWNCONFIGURATIONSTEST_FAKE_PREFS=fake prefs -KNOWNCONFIGURATIONSTEST_NEW_TEST=new test -KNOWNCONFIGURATIONSTEST_NO_SF_SHOULD_BE_BUILD=no sf should be built\! -KNOWNCONFIGURATIONSTEST_NO_SF_SHOULD_BE_CLOSED=no sf should be closed\! -KNOWNCONFIGURATIONSTEST_TRYING_REMOVE_NON_EXISTING_CONSOLE=trying to remove a non existing console -PERSPECTIVETEST_HIBERNATE=Hibernate -REFACTORINGTEST_CATEGORY=Category -REFACTORINGTEST_COREEXCEPTION_OCCURED_WORK_WITH_MEMENTO=CoreException occured when try to work with memento. -REFACTORINGTEST_EXCEPTION_WHILE_FILENAMECHANGE_REFACTOR=Exception while FileNameChange refactor processing\! -REFACTORINGTEST_EXCEPTION_WHILE_FINDCHANGE_LAUNCH_CONFIG_PROCESSING=Exception while FindChanged launch configurations processing\! -REFACTORINGTEST_EXCEPTION_WHILE_PACKNAMECHANGE_REFACTOR=Exception while PackNameChange refactor processing\! -REFACTORINGTEST_EXCEPTION_WHILE_PROJNAMECHANGE_REFACTOR=Exception while ProjectNameChange refactor processing\! -REFACTORINGTEST_EXCEPTION_WHILE_SRCNAMECHANGE_REFACTOR=Exception while SrcNameChange refactor processing\! -REFACTORINGTEST_METHOD_NOT_TESTED=Method doesn't tested -REFACTORINGTEST_SEGMENTNUM_TOO_MATCH=SegmentNum is too mach. -REFACTORINGTEST_TEST_LAUNCH_CONFIG=Test Launch Config

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8612 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor: editors and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2008-06-06 12:50:40 -0400 (Fri, 06 Jun 2008) New Revision: 8612 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/UIVEditorMessages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/UIVEditorMessages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ColorConstants.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ColorConstants.properties Removed: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/messages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/messages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/messages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/messages.properties Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/EditorActionContributor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/ExportImageAction.java 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 trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/ShapeSetConstraintCommand.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmEditPartFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.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.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java Log: http://opensource.atlassian.com/projects/hibernate/browse/HBX-500 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/UIVEditorMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/UIVEditorMessages.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/UIVEditorMessages.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -0,0 +1,40 @@ +/******************************************************************************* + * 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; + +import org.eclipse.osgi.util.NLS; + +public class UIVEditorMessages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.UIVEditorMessages"; //$NON-NLS-1$ + + private UIVEditorMessages() { + } + + static { + NLS.initializeMessages(BUNDLE_NAME, UIVEditorMessages.class); + } + + public static String EditorActionContributor_refresh_visual_mapping; + public static String VisualEditor_diagram_for; + public static String ExportImageAction_bmp_format; + public static String ExportImageAction_error; + public static String ExportImageAction_failed_to_export_image; + public static String ExportImageAction_jpg_format; + public static String ExportImageAction_png_format; + public static String OpenMappingAction_canot_find_or_open_mapping_file; + public static String OpenMappingAction_open_mapping_file; + public static String OpenSourceAction_canot_find_source_file; + public static String OpenSourceAction_canot_open_source_file; + public static String OpenSourceAction_open_source_file; + public static String ShapeSetConstraintCommand_move; + public static String PartFactory_canot_create_part_for_model_element; + public static String PartFactory_null; +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/UIVEditorMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/UIVEditorMessages.properties (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/UIVEditorMessages.properties 2008-06-06 16:50:40 UTC (rev 8612) @@ -0,0 +1,15 @@ +EditorActionContributor_refresh_visual_mapping=Refresh Visual Mapping +VisualEditor_diagram_for=Diagram for +ExportImageAction_bmp_format=Bitmap format (*.bmp) +ExportImageAction_error=Error +ExportImageAction_failed_to_export_image=Failed to export image: +ExportImageAction_jpg_format=JPEG format (*.jpg) +ExportImageAction_png_format=PNG format (*.png) +OpenMappingAction_canot_find_or_open_mapping_file=Can't find or open mapping file. +OpenMappingAction_open_mapping_file=Open Mapping File +OpenSourceAction_canot_find_source_file=Can't find source file. +OpenSourceAction_canot_open_source_file=Can't open source file. +OpenSourceAction_open_source_file=Open Source File +ShapeSetConstraintCommand_move=move +PartFactory_canot_create_part_for_model_element=Can't create part for model element: +PartFactory_null=null Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/EditorActionContributor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/EditorActionContributor.java 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/EditorActionContributor.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -16,25 +16,26 @@ import org.eclipse.jface.action.IToolBarManager; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction; +import org.jboss.tools.hibernate.ui.veditor.UIVEditorMessages; import org.jboss.tools.hibernate.ui.view.ViewPlugin; public class EditorActionContributor extends ActionBarContributor { - + protected void buildActions() { IWorkbenchAction workbenchAction = ActionFactory.REFRESH.create(getPage().getWorkbenchWindow()); workbenchAction.setImageDescriptor(ViewPlugin.getImageDescriptor(ViewPlugin.BUNDLE_IMAGE.getString("Explorer.refreshOrmGef"))); //$NON-NLS-1$ - workbenchAction.setToolTipText(Messages.EditorActionContributor_Refresh_Visual_Mapping); + workbenchAction.setToolTipText(UIVEditorMessages.EditorActionContributor_refresh_visual_mapping); addAction(workbenchAction); addRetargetAction(new UndoRetargetAction()); addRetargetAction(new RedoRetargetAction()); } - + public void contributeToToolBar(IToolBarManager toolBarManager) { toolBarManager.add(getAction(ActionFactory.REFRESH.getId())); toolBarManager.add(getAction(ActionFactory.UNDO.getId())); toolBarManager.add(getAction(ActionFactory.REDO.getId())); } - + protected void declareGlobalActionKeys() { } } \ No newline at end of file Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/Messages.java 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/Messages.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -1,27 +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; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.editors.messages"; //$NON-NLS-1$ - - private Messages() { - } - - static { - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - public static String EditorActionContributor_Refresh_Visual_Mapping; - public static String VISUALEDITOR_DIAGRAM_FOR; -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -34,6 +34,7 @@ import org.hibernate.console.ConsoleConfiguration; import org.hibernate.mapping.Column; import org.hibernate.mapping.RootClass; +import org.jboss.tools.hibernate.ui.veditor.UIVEditorMessages; import org.jboss.tools.hibernate.ui.veditor.editors.actions.AutoLayoutAction; import org.jboss.tools.hibernate.ui.veditor.editors.actions.ExportImageAction; import org.jboss.tools.hibernate.ui.veditor.editors.actions.OpenMappingAction; @@ -49,18 +50,18 @@ import org.jboss.tools.hibernate.ui.view.views.ObjectEditorInput; public class VisualEditor extends GraphicalEditor { - + private OrmDiagram ormDiagram = null; - + public VisualEditor() { setEditDomain(new DefaultEditDomain(this)); } - + public void doSave(IProgressMonitor monitor) { ormDiagram.save(); ormDiagram.setDirty(false); } - + public void doSaveAs() { } @@ -75,13 +76,13 @@ viewer.setContextMenu(provider); getSite().registerContextMenu("FlowDiagramContextmenu", provider, viewer); //$NON-NLS-1$ } - + public GraphicalViewer getEditPartViewer() { return getGraphicalViewer(); } - + protected void createActions() { - + getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.REFRESH.getId(),new WorkbenchPartAction(this){ protected boolean calculateEnabled() { @@ -91,9 +92,9 @@ ormDiagram.refresh(); } }); - + super.createActions(); - + getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.PRINT.getId(), getActionRegistry().getAction(ActionFactory.PRINT.getId())); ActionRegistry registry = getActionRegistry(); @@ -110,9 +111,9 @@ action = new AutoLayoutAction(this); registry.registerAction(action); - + } - + private TransferDropTargetListener createTransferDropTargetListener() { return new TemplateTransferDropTargetListener(getGraphicalViewer()) { protected CreationFactory getFactory(Object template) { @@ -120,23 +121,23 @@ } }; } - + public boolean isSaveAsAllowed() { return false; } - + public boolean isSaveOnCloseNeeded() { return true; } - + public void refreshDirty() { firePropertyChange(IEditorPart.PROP_DIRTY); } - + public boolean isDirty() { return ormDiagram.isDirty(); } - + protected void setInput(IEditorInput input) { super.setInput(input); ObjectEditorInput objectEditorInput = (ObjectEditorInput)input; @@ -144,7 +145,7 @@ Object obj = objectEditorInput.getObject(); if (obj instanceof RootClass) { RootClass rootClass = (RootClass)obj; - setPartName(Messages.VISUALEDITOR_DIAGRAM_FOR + rootClass.getEntityName()); + setPartName(UIVEditorMessages.VisualEditor_diagram_for + rootClass.getEntityName()); ormDiagram = new OrmDiagram(configuration, rootClass, objectEditorInput.getJavaProject()); } else if (obj instanceof RootClass[]) { @@ -153,11 +154,11 @@ for (int i = 1; i < rootClasses.length; i++) { name += " & " + rootClasses[i].getEntityName(); //$NON-NLS-1$ } - setPartName(Messages.VISUALEDITOR_DIAGRAM_FOR + name); + setPartName(UIVEditorMessages.VisualEditor_diagram_for + name); ormDiagram = new OrmDiagram(configuration, rootClasses, objectEditorInput.getJavaProject()); } } - + public Object getAdapter(Class type) { if (type == IContentOutlinePage.class) { DiagramContentOutlinePage outline = new DiagramContentOutlinePage( @@ -171,7 +172,7 @@ return super.getAdapter(type); } - + public Set getSelectedElements_old() { Set ret = new HashSet(); List selectedEditParts = getGraphicalViewer().getSelectedEditParts(); @@ -211,9 +212,9 @@ public OrmDiagram getViewerContents() { return ormDiagram; } - + public DefaultEditDomain getDefaultEditDomain() { return getEditDomain(); } - + } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/ExportImageAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/ExportImageAction.java 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/ExportImageAction.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -19,11 +19,12 @@ import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.ImageLoader; import org.eclipse.swt.widgets.FileDialog; +import org.jboss.tools.hibernate.ui.veditor.UIVEditorMessages; import org.jboss.tools.hibernate.ui.veditor.editors.VisualEditor; public class ExportImageAction extends Action { - public static final String ACTION_ID = Messages.EXPORTIMAGEACTION_EXPORT_AS_IMAGE; + public static final String ACTION_ID = "Export as Image"; //$NON-NLS-1$ private VisualEditor editor; @@ -41,8 +42,8 @@ this.editor.getSite().getShell(), SWT.SAVE); saveDialog .setFilterExtensions(new String[] { "*.png", "*.jpg", "*.bmp" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - saveDialog.setFilterNames(new String[] { Messages.EXPORTIMAGEACTION_PNG_FORMAT, - Messages.EXPORTIMAGEACTION_JPG_FORMAT, Messages.EXPORTIMAGEACTION_BMP_FORMAT }); + saveDialog.setFilterNames(new String[] { UIVEditorMessages.ExportImageAction_png_format, + UIVEditorMessages.ExportImageAction_jpg_format, UIVEditorMessages.ExportImageAction_bmp_format }); String filePath = saveDialog.open(); if (filePath == null || filePath.trim().length() == 0) { @@ -67,7 +68,7 @@ outStream.close(); } catch (Throwable e) { MessageDialog.openInformation(this.editor.getSite().getShell(), - Messages.EXPORTIMAGEACTION_ERROR, Messages.EXPORTIMAGEACTION_FAILED_TO_EXPORT_IMAGE + e.getMessage()); + UIVEditorMessages.ExportImageAction_error, UIVEditorMessages.ExportImageAction_failed_to_export_image + e.getMessage()); return; } } Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/Messages.java 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/Messages.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -1,25 +0,0 @@ -package org.jboss.tools.hibernate.ui.veditor.editors.actions; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.editors.actions.messages"; //$NON-NLS-1$ - public static String EXPORTIMAGEACTION_BMP_FORMAT; - public static String EXPORTIMAGEACTION_ERROR; - public static String EXPORTIMAGEACTION_EXPORT_AS_IMAGE; - public static String EXPORTIMAGEACTION_FAILED_TO_EXPORT_IMAGE; - public static String EXPORTIMAGEACTION_JPG_FORMAT; - public static String EXPORTIMAGEACTION_PNG_FORMAT; - public static String OPENMAPPINGACTION_CANOT_FIND_OR_OPEN_MAPPING_FILE; - public static String OPENMAPPINGACTION_OPEN_MAPPING_FILE; - public static String OPENSOURCEACTION_CANOT_FIND_SOURCE_FILE; - public static String OPENSOURCEACTION_CANOT_OPEN_SOURCE_FILE; - public static String OPENSOURCEACTION_OPEN_SOURCE_FILE; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} 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-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -18,6 +18,7 @@ import org.hibernate.console.ConsoleConfiguration; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.mapping.Property; +import org.jboss.tools.hibernate.ui.veditor.UIVEditorMessages; 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.model.SpecialRootClass; @@ -33,7 +34,7 @@ public OpenMappingAction(IWorkbenchPart part) { super(part); setId(ACTION_ID); - setText(Messages.OPENMAPPINGACTION_OPEN_MAPPING_FILE); + setText(UIVEditorMessages.OpenMappingAction_open_mapping_file); setImageDescriptor(VisualEditorPlugin.getImageDescriptor("icons/mapping.gif")); //$NON-NLS-1$ } @@ -56,7 +57,7 @@ try { org.hibernate.eclipse.console.actions.OpenMappingAction.run(compositSel, parentProperty, consoleConfiguration); } catch (Exception e) { - HibernateConsolePlugin.getDefault().logErrorMessage(Messages.OPENMAPPINGACTION_CANOT_FIND_OR_OPEN_MAPPING_FILE, e); + HibernateConsolePlugin.getDefault().logErrorMessage(UIVEditorMessages.OpenMappingAction_canot_find_or_open_mapping_file, e); } continue; } @@ -66,9 +67,9 @@ try { org.hibernate.eclipse.console.actions.OpenMappingAction.run(selection, consoleConfiguration); } catch (Exception e) { - HibernateConsolePlugin.getDefault().logErrorMessage(Messages.OPENMAPPINGACTION_OPEN_MAPPING_FILE, e); - } - + HibernateConsolePlugin.getDefault().logErrorMessage(UIVEditorMessages.OpenMappingAction_open_mapping_file, e); + } + /*IResource resource = null; Object selectedElement = selection; if (selectedElement instanceof RootClass) { @@ -135,13 +136,13 @@ if (selectedElement instanceof PersistentClass || (selectedElement instanceof Property && ((Property)selectedElement).getPersistentClass() != null)){ - org.hibernate.eclipse.console.actions.OpenMappingAction.applySelectionToEditor(selectedElement, editorPart); + org.hibernate.eclipse.console.actions.OpenMappingAction.applySelectionToEditor(selectedElement, editorPart); } } catch (PartInitException e) { VisualEditorPlugin.getDefault().logInfo("Can't open mapping file", e); } }*/ - } + } } protected boolean calculateEnabled() { 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-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -14,6 +14,7 @@ import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; +import org.jboss.tools.hibernate.ui.veditor.UIVEditorMessages; import org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin; import org.jboss.tools.hibernate.ui.veditor.editors.VisualEditor; import org.jboss.tools.hibernate.ui.view.views.ObjectEditorInput; @@ -28,7 +29,7 @@ public OpenSourceAction(IWorkbenchPart part) { super(part); setId(ACTION_ID); - setText(Messages.OPENSOURCEACTION_OPEN_SOURCE_FILE); + setText(UIVEditorMessages.OpenSourceAction_open_source_file); setImageDescriptor(VisualEditorPlugin.getImageDescriptor("icons/java.gif")); //$NON-NLS-1$ } @@ -46,11 +47,11 @@ Object selection = iterator.next(); PersistentClass rootClass = null; if (selection instanceof PersistentClass) { - rootClass = (PersistentClass) selection; + rootClass = (PersistentClass) selection; } else if (selection instanceof Property) { - rootClass = ((Property) selection).getPersistentClass(); + rootClass = ((Property) selection).getPersistentClass(); } else continue; - + IResource resource = null; String fullyQualifiedName = rootClass.getClassName();//HibernateUtils.getPersistentClassName(rootClass); /*if (fullyQualifiedName.indexOf("$") > 0) { @@ -59,11 +60,11 @@ try { new org.hibernate.eclipse.console.actions.OpenSourceAction().run(selection, proj, fullyQualifiedName); } catch (PartInitException e) { - HibernateConsolePlugin.getDefault().logErrorMessage(Messages.OPENSOURCEACTION_CANOT_OPEN_SOURCE_FILE, e); + HibernateConsolePlugin.getDefault().logErrorMessage(UIVEditorMessages.OpenSourceAction_canot_open_source_file, e); } catch (JavaModelException e) { - HibernateConsolePlugin.getDefault().logErrorMessage(Messages.OPENSOURCEACTION_CANOT_FIND_SOURCE_FILE, e); + HibernateConsolePlugin.getDefault().logErrorMessage(UIVEditorMessages.OpenSourceAction_canot_find_source_file, e); } catch (FileNotFoundException e) { - HibernateConsolePlugin.getDefault().logErrorMessage(Messages.OPENSOURCEACTION_CANOT_FIND_SOURCE_FILE, e); + HibernateConsolePlugin.getDefault().logErrorMessage(UIVEditorMessages.OpenSourceAction_canot_find_source_file, e); } } } @@ -75,7 +76,7 @@ while (iterator.hasNext()) { Object elem = iterator.next(); if (elem instanceof PersistentClass - || elem instanceof Property) return true; + || elem instanceof Property) return true; } return false; } Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/messages.properties 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/messages.properties 2008-06-06 16:50:40 UTC (rev 8612) @@ -1,11 +0,0 @@ -EXPORTIMAGEACTION_BMP_FORMAT=Bitmap format (*.bmp) -EXPORTIMAGEACTION_ERROR=Error -EXPORTIMAGEACTION_EXPORT_AS_IMAGE=Export as Image -EXPORTIMAGEACTION_FAILED_TO_EXPORT_IMAGE=Failed to export image: -EXPORTIMAGEACTION_JPG_FORMAT=JPEG format (*.jpg) -EXPORTIMAGEACTION_PNG_FORMAT=PNG format (*.png) -OPENMAPPINGACTION_CANOT_FIND_OR_OPEN_MAPPING_FILE=Can't find or open mapping file. -OPENMAPPINGACTION_OPEN_MAPPING_FILE=Open Mapping File -OPENSOURCEACTION_CANOT_FIND_SOURCE_FILE=Can't find source file. -OPENSOURCEACTION_CANOT_OPEN_SOURCE_FILE=Can't open source file. -OPENSOURCEACTION_OPEN_SOURCE_FILE=Open Source File Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/Messages.java 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/Messages.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -1,15 +0,0 @@ -package org.jboss.tools.hibernate.ui.veditor.editors.command; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.editors.command.messages"; //$NON-NLS-1$ - public static String SHAPESETCONSTRAINTCOMMAND_MOVE; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/ShapeSetConstraintCommand.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/ShapeSetConstraintCommand.java 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/ShapeSetConstraintCommand.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -15,6 +15,7 @@ import org.eclipse.gef.RequestConstants; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.jboss.tools.hibernate.ui.veditor.UIVEditorMessages; import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmShape; @@ -22,10 +23,10 @@ private final Point newLocation; private Point oldLocation; private final ChangeBoundsRequest request; - + private final OrmShape shape; - - public ShapeSetConstraintCommand(OrmShape shape, ChangeBoundsRequest req, + + public ShapeSetConstraintCommand(OrmShape shape, ChangeBoundsRequest req, Point newLocation) { if (shape == null || req == null || newLocation == null) { throw new IllegalArgumentException(); @@ -33,24 +34,24 @@ this.shape = shape; this.request = req; this.newLocation = newLocation.getCopy(); - setLabel(Messages.SHAPESETCONSTRAINTCOMMAND_MOVE); + setLabel(UIVEditorMessages.ShapeSetConstraintCommand_move); } - + public boolean canExecute() { Object type = request.getType(); return (RequestConstants.REQ_MOVE.equals(type) - || RequestConstants.REQ_MOVE_CHILDREN.equals(type)); + || RequestConstants.REQ_MOVE_CHILDREN.equals(type)); } - + public void execute() { oldLocation = shape.getLocation(); redo(); } - + public void redo() { shape.setLocation(newLocation); } - + public void undo() { shape.setLocation(oldLocation); } Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/messages.properties 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/command/messages.properties 2008-06-06 16:50:40 UTC (rev 8612) @@ -1 +0,0 @@ -SHAPESETCONSTRAINTCOMMAND_MOVE=move Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/messages.properties 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/messages.properties 2008-06-06 16:50:40 UTC (rev 8612) @@ -1,2 +0,0 @@ -EditorActionContributor_Refresh_Visual_Mapping=Refresh Visual Mapping -VISUALEDITOR_DIAGRAM_FOR=Diagram for Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ColorConstants.java (from rev 8541, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/Messages.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ColorConstants.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ColorConstants.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -0,0 +1,39 @@ +/******************************************************************************* + * 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.parts; + +import org.eclipse.osgi.util.NLS; + +public class ColorConstants extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.editors.parts.ColorConstants"; //$NON-NLS-1$ + + private ColorConstants() { + } + + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, ColorConstants.class); + } + + public static String Colors_PersistentClassR; + public static String Colors_PersistentClassG; + public static String Colors_PersistentClassB; + public static String Colors_PersistentFieldR; + public static String Colors_PersistentFieldG; + public static String Colors_PersistentFieldB; + public static String Colors_DatabaseTableR; + public static String Colors_DatabaseTableG; + public static String Colors_DatabaseTableB; + public static String Colors_DatabaseColumnR; + public static String Colors_DatabaseColumnG; + public static String Colors_DatabaseColumnB; + +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ColorConstants.properties (from rev 8541, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/messages.properties) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ColorConstants.properties (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ColorConstants.properties 2008-06-06 16:50:40 UTC (rev 8612) @@ -0,0 +1,12 @@ +Colors_PersistentClassR=255 +Colors_PersistentClassG=247 +Colors_PersistentClassB=206 +Colors_PersistentFieldR=255 +Colors_PersistentFieldG=255 +Colors_PersistentFieldB=239 +Colors_DatabaseTableR=222 +Colors_DatabaseTableG=231 +Colors_DatabaseTableB=239 +Colors_DatabaseColumnR=239 +Colors_DatabaseColumnG=247 +Colors_DatabaseColumnB=255 Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/Messages.java 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/Messages.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -1,58 +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.parts; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.editors.parts.messages"; //$NON-NLS-1$ - - private Messages() { - } - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - public static String Colors_PersistentClassR; - - public static String Colors_PersistentClassG; - - public static String Colors_PersistentClassB; - - public static String Colors_PersistentFieldR; - - public static String Colors_PersistentFieldG; - - public static String Colors_PersistentFieldB; - - public static String Colors_DatabaseTableR; - - public static String Colors_DatabaseTableG; - - public static String Colors_DatabaseTableB; - - public static String Colors_DatabaseColumnR; - - public static String Colors_DatabaseColumnG; - - public static String Colors_DatabaseColumnB; - - public static String ORMEDITPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT; - - public static String ORMEDITPARTFACTORY_NULL; - - public static String TREEPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT; - - public static String TREEPARTFACTORY_NULL; - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmEditPartFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmEditPartFactory.java 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmEditPartFactory.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -12,6 +12,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; +import org.jboss.tools.hibernate.ui.veditor.UIVEditorMessages; import org.jboss.tools.hibernate.ui.veditor.editors.model.ComponentShape; import org.jboss.tools.hibernate.ui.veditor.editors.model.Connection; import org.jboss.tools.hibernate.ui.veditor.editors.model.ExpandeableShape; @@ -21,14 +22,14 @@ public class OrmEditPartFactory implements EditPartFactory { - - + + public EditPart createEditPart(EditPart context, Object modelElement) { EditPart part = getPartForElement(modelElement); part.setModel(modelElement); return part; } - + private EditPart getPartForElement(Object modelElement) { if (modelElement instanceof OrmDiagram) { return new DiagramEditPart(); @@ -49,8 +50,8 @@ return new ConnectionEditPart(); } throw new RuntimeException( - Messages.ORMEDITPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT - + ((modelElement != null) ? modelElement.getClass().getName() : Messages.ORMEDITPARTFACTORY_NULL)); + UIVEditorMessages.PartFactory_canot_create_part_for_model_element + + ((modelElement != null) ? modelElement.getClass().getName() : UIVEditorMessages.PartFactory_null)); } - + } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.java 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/OrmShapeEditPart.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -86,14 +86,14 @@ } else { throw new IllegalArgumentException(); } - } - + } + public void performRequest(Request req) { if(RequestConstants.REQ_OPEN.equals(req.getType()) && getModel() instanceof OrmShape) { ((OrmShape)getModel()).refreshHiden(); } } - + public void propertyChange(PropertyChangeEvent evt) { String prop = evt.getPropertyName(); if (OrmShape.LOCATION_PROP.equals(prop)) { @@ -121,16 +121,16 @@ } if (bounds != null) ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), bounds); } - + protected Color getBackgroundColor() { Object element = getCastedModel().getOrmElement(); - if (element instanceof PersistentClass || element instanceof Component) + if (element instanceof PersistentClass || element instanceof Component) return ResourceManager.getInstance().getColor(new RGB(0,0,0)); else if (element instanceof Table || element instanceof Property) return ResourceManager.getInstance().getColor(new RGB( - Integer.parseInt(Messages.Colors_DatabaseColumnR), - Integer.parseInt(Messages.Colors_DatabaseColumnG), - Integer.parseInt(Messages.Colors_DatabaseColumnB))); + Integer.parseInt(ColorConstants.Colors_DatabaseColumnR), + Integer.parseInt(ColorConstants.Colors_DatabaseColumnG), + Integer.parseInt(ColorConstants.Colors_DatabaseColumnB))); else throw new IllegalArgumentException(); } 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 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -57,14 +57,14 @@ public class ShapeEditPart extends OrmEditPart implements PropertyChangeListener, NodeEditPart { - static protected OrmLabelProvider ormLabelProvider = + static protected OrmLabelProvider ormLabelProvider = new OrmLabelProvider(new OrmModelImageVisitor(), new OrmModelNameVisitor()); - + protected void createEditPolicies() { installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ShapesSelectionEditPolicy()); } - + protected IFigure createFigure() { if (getModel() instanceof Shape) { Label label = new Label(); @@ -76,7 +76,7 @@ if (model instanceof OrmDiagram) { cfg = ((OrmDiagram) model).getConsoleConfiguration(); } - label.setText(ormLabelProvider.getText(getElement(), cfg)); + label.setText(ormLabelProvider.getText(getElement(), cfg)); label.setBackgroundColor(getColor()); label.setIcon(ormLabelProvider.getImage(getElement())); label.setLabelAlignment(PositionConstants.LEFT); @@ -93,11 +93,11 @@ public void propertyChange(PropertyChangeEvent evt) { String prop = evt.getPropertyName(); if (Shape.SHOW_SELECTION.equals(prop)) { - getFigure().setBackgroundColor(getSelectionColor()); - getFigure().setForegroundColor(ResourceManager.getInstance().getColor(new RGB(255,255,255))); + getFigure().setBackgroundColor(getSelectionColor()); + getFigure().setForegroundColor(ResourceManager.getInstance().getColor(new RGB(255,255,255))); } else if (Shape.HIDE_SELECTION.equals(prop)) { - getFigure().setBackgroundColor(getColor()); - getFigure().setForegroundColor(ResourceManager.getInstance().getColor(new RGB(0,0,0))); + getFigure().setBackgroundColor(getColor()); + getFigure().setForegroundColor(ResourceManager.getInstance().getColor(new RGB(0,0,0))); } else if (Shape.SET_FOCUS.equals(prop)) { getViewer().select(this); getViewer().reveal(this); @@ -123,14 +123,14 @@ ((ModelElement) getModel()).addPropertyChangeListener(this); } } - + public void deactivate() { if (isActive()) { super.deactivate(); ((ModelElement) getModel()).removePropertyChangeListener(this); } } - + protected Shape getCastedModel() { return (Shape) getModel(); } @@ -138,7 +138,7 @@ protected List getModelSourceConnections() { return getCastedModel().getSourceConnections(); } - + protected List getModelTargetConnections() { return getCastedModel().getTargetConnections(); } @@ -146,19 +146,19 @@ public ConnectionAnchor getSourceConnectionAnchor(ConnectionEditPart connection) { return getConnectionAnchor(); } - + public ConnectionAnchor getTargetConnectionAnchor(ConnectionEditPart connection) { return getConnectionAnchor(); } - + public ConnectionAnchor getSourceConnectionAnchor(Request request) { return getConnectionAnchor(); } - + public ConnectionAnchor getTargetConnectionAnchor(Request request) { return getConnectionAnchor(); } - + protected ConnectionAnchor getConnectionAnchor() { ChopboxAnchor anchor = new ChopboxAnchor(getFigure()){ public Point getLocation(Point reference) { @@ -170,16 +170,16 @@ } OrmShapeEditPart part = getOrmShapeEditPart(); Point p = r.getCenter(); - if (reference.x < p.x) + if (reference.x < p.x) p.x-=part.getFigure().getBounds().width/2; - else - p.x+=part.getFigure().getBounds().width/2; + else + p.x+=part.getFigure().getBounds().width/2; return p; } }; return anchor; } - + protected OrmShapeEditPart getOrmShapeEditPart() { int i = 0; EditPart part = this; @@ -193,81 +193,81 @@ protected Color getColor() { Object element = getCastedModel().getOrmElement(); - if (element instanceof PersistentClass || element instanceof Component) + if (element instanceof PersistentClass || element instanceof Component) return ResourceManager.getInstance().getColor(new RGB( - Integer.parseInt(Messages.Colors_PersistentClassR), - Integer.parseInt(Messages.Colors_PersistentClassG), - Integer.parseInt(Messages.Colors_PersistentClassB))); - else if (element instanceof Property || element instanceof SimpleValue) + Integer.parseInt(ColorConstants.Colors_PersistentClassR), + Integer.parseInt(ColorConstants.Colors_PersistentClassG), + Integer.parseInt(ColorConstants.Colors_PersistentClassB))); + 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))); - else if (element instanceof Column) + Integer.parseInt(ColorConstants.Colors_PersistentFieldR), + Integer.parseInt(ColorConstants.Colors_PersistentFieldG), + Integer.parseInt(ColorConstants.Colors_PersistentFieldB))); + 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))); - else if (element instanceof Table) + Integer.parseInt(ColorConstants.Colors_DatabaseColumnR), + Integer.parseInt(ColorConstants.Colors_DatabaseColumnG), + Integer.parseInt(ColorConstants.Colors_DatabaseColumnB))); + else if (element instanceof Table) return ResourceManager.getInstance().getColor(new RGB( - Integer.parseInt(Messages.Colors_DatabaseTableR), - Integer.parseInt(Messages.Colors_DatabaseTableG), - Integer.parseInt(Messages.Colors_DatabaseTableB))); - else if (element instanceof DependantValue) + Integer.parseInt(ColorConstants.Colors_DatabaseTableR), + Integer.parseInt(ColorConstants.Colors_DatabaseTableG), + Integer.parseInt(ColorConstants.Colors_DatabaseTableB))); + else if (element instanceof DependantValue) return ResourceManager.getInstance().getColor(new RGB( - Integer.parseInt(Messages.Colors_DatabaseTableR), - Integer.parseInt(Messages.Colors_DatabaseTableG), - Integer.parseInt(Messages.Colors_DatabaseTableB))); - else if (element instanceof OneToMany) + Integer.parseInt(ColorConstants.Colors_DatabaseTableR), + Integer.parseInt(ColorConstants.Colors_DatabaseTableG), + Integer.parseInt(ColorConstants.Colors_DatabaseTableB))); + else if (element instanceof OneToMany) return ResourceManager.getInstance().getColor(new RGB( - Integer.parseInt(Messages.Colors_PersistentFieldR), - Integer.parseInt(Messages.Colors_PersistentFieldG), - Integer.parseInt(Messages.Colors_PersistentFieldB))); + Integer.parseInt(ColorConstants.Colors_PersistentFieldR), + Integer.parseInt(ColorConstants.Colors_PersistentFieldG), + Integer.parseInt(ColorConstants.Colors_PersistentFieldB))); else return ResourceManager.getInstance().getColor(new RGB(255, 0, 0)); } protected Color getSelectionColor() { - if (getCastedModel().getOrmElement() instanceof PersistentClass || - getCastedModel().getOrmElement() instanceof Property || + if (getCastedModel().getOrmElement() instanceof PersistentClass || + getCastedModel().getOrmElement() instanceof Property || getCastedModel().getOrmElement() instanceof SimpleValue || - getCastedModel().getOrmElement() instanceof OneToMany) + getCastedModel().getOrmElement() instanceof OneToMany) return ResourceManager.getInstance().getColor(new RGB(112,161,99)); - else if (getCastedModel().getOrmElement() instanceof Table || getCastedModel().getOrmElement() instanceof Column) + else if (getCastedModel().getOrmElement() instanceof Table || getCastedModel().getOrmElement() instanceof Column) return ResourceManager.getInstance().getColor(new RGB(66,173,247)); return ResourceManager.getInstance().getColor(new RGB(255,0,0)); } - + private class ShapesSelectionEditPolicy extends SelectionEditPolicy { protected void hideSelection() { getCastedModel().hideSelection(); - Iterator iter = getCastedModel().getSourceConnections().iterator(); + Iterator iter = getCastedModel().getSourceConnections().iterator(); while (iter.hasNext()) { Connection element = (Connection) iter.next(); - element.hideSelection(); + element.hideSelection(); } - iter = getCastedModel().getTargetConnections().iterator(); + iter = getCastedModel().getTargetConnections().iterator(); while (iter.hasNext()) { Connection element = (Connection) iter.next(); - element.hideSelection(); + element.hideSelection(); } } protected void showSelection() { getCastedModel().showSelection(); - Iterator iter = getCastedModel().getSourceConnections().iterator(); + Iterator iter = getCastedModel().getSourceConnections().iterator(); while (iter.hasNext()) { Connection element = (Connection) iter.next(); - element.showSelection(); + element.showSelection(); } - iter = getCastedModel().getTargetConnections().iterator(); + iter = getCastedModel().getTargetConnections().iterator(); while (iter.hasNext()) { Connection element = (Connection) iter.next(); - element.showSelection(); + element.showSelection(); } } - + } protected Object getElement() { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/TreePartFactory.java 2008-06-06 16:50:40 UTC (rev 8612) @@ -2,6 +2,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; +import org.jboss.tools.hibernate.ui.veditor.UIVEditorMessages; import org.jboss.tools.hibernate.ui.veditor.editors.model.ExpandeableShape; import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; import org.jboss.tools.hibernate.ui.veditor.editors.model.Shape; @@ -18,9 +19,9 @@ if (modelElement instanceof Shape) { return new ShapeTreeEditPart(modelElement); } - throw new RuntimeException(Messages.TREEPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT + throw new RuntimeException(UIVEditorMessages.PartFactory_canot_create_part_for_model_element + ((modelElement != null) ? modelElement.getClass().getName() - : Messages.TREEPARTFACTORY_NULL)); + : UIVEditorMessages.PartFactory_null)); } } Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/messages.properties 2008-06-06 16:40:25 UTC (rev 8611) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/messages.properties 2008-06-06 16:50:40 UTC (rev 8612) @@ -1,16 +0,0 @@ -Colors_PersistentClassR=255 -Colors_PersistentClassG=247 -Colors_PersistentClassB=206 -Colors_PersistentFieldR=255 -Colors_PersistentFieldG=255 -Colors_PersistentFieldB=239 -Colors_DatabaseTableR=222 -Colors_DatabaseTableG=231 -Colors_DatabaseTableB=239 -Colors_DatabaseColumnR=239 -Colors_DatabaseColumnG=247 -Colors_DatabaseColumnB=255 -ORMEDITPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT=Can't create part for model element: -ORMEDITPARTFACTORY_NULL=null -TREEPARTFACTORY_CANOT_CREATE_PART_FOR_MODEL_ELEMENT=Can't create part for model element: -TREEPARTFACTORY_NULL=null

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8611 - trunk/documentation/jboss-tools-docs.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-06-06 12:40:25 -0400 (Fri, 06 Jun 2008) New Revision: 8611 Modified: trunk/documentation/jboss-tools-docs/pom.xml Log: Fix jboss-tools-doc build error Modified: trunk/documentation/jboss-tools-docs/pom.xml =================================================================== --- trunk/documentation/jboss-tools-docs/pom.xml 2008-06-06 14:21:22 UTC (rev 8610) +++ trunk/documentation/jboss-tools-docs/pom.xml 2008-06-06 16:40:25 UTC (rev 8611) @@ -31,6 +31,7 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-1</version> <configuration> <descriptors> <descriptor>all-guides.xml</descriptor>

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8610 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: estherbin Date: 2008-06-06 10:21:22 -0400 (Fri, 06 Jun 2008) New Revision: 8610 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesProgressBarTemplateTestCase.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF Log: Fix RichFacesProgressBarTemplate.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2008-06-06 13:23:22 UTC (rev 8609) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2008-06-06 14:21:22 UTC (rev 8610) @@ -14,7 +14,8 @@ org.eclipse.ui.workbench.texteditor, org.eclipse.ui.ide, org.mozilla.xpcom, - org.eclipse.wst.sse.core + org.eclipse.wst.sse.core, + org.jboss.tools.vpe.xulrunner Eclipse-LazyStart: true Bundle-Vendor: Red Hat, Inc. Bundle-ClassPath: lib/jhighlight-1.0.jar, Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java 2008-06-06 13:23:22 UTC (rev 8609) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java 2008-06-06 14:21:22 UTC (rev 8610) @@ -36,6 +36,9 @@ */ public class RichFacesProgressBarTemplate extends AbstractRichFacesTemplate { + /** The Constant DEFAULT_HEIGHT. */ + private static final String DEFAULT_HEIGHT = " height:13px;"; + /** The Constant CSS_EXTENSION. */ private static final String CSS_EXTENSION = "progressBar"; @@ -111,7 +114,7 @@ } } } - +// // DOMTreeDumper dump = new DOMTreeDumper(); // dump.dumpToStream(System.err, progressDiv); @@ -140,8 +143,8 @@ * Checks if is recreate at attr change. * * @param sourceElement the source element + * @param visualDocument the visual document * @param value the value - * @param visualDocument the visual document * @param visualNode the visual node * @param data the data * @param pageContext the page context @@ -163,6 +166,9 @@ private void prepareData(Element source) { this.styleClass = ComponentUtil.getAttribute(source, RichFaces.ATTR_STYLE_CLASS); this.style = ComponentUtil.getAttribute(source, HTML.ATTR_STYLE); + if (ComponentUtil.isBlank(this.style)) { + this.style = DEFAULT_HEIGHT; + } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2008-06-06 13:23:22 UTC (rev 8609) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2008-06-06 14:21:22 UTC (rev 8610) @@ -40,23 +40,23 @@ TestSuite suite = new TestSuite("Tests for Vpe RichFaces components"); // $NON-NLS-1$ // $JUnit-BEGIN$ - suite.addTestSuite(RichFacesComponentTest.class); - suite.addTestSuite(JBIDE1579Test.class); - suite.addTestSuite(Jbide1580Test.class); - suite.addTestSuite(JBIDE1613Test.class); - suite.addTestSuite(Jbide1614Test.class); - suite.addTestSuite(Jbide1639Test.class); - suite.addTestSuite(Jbide1682Test.class); - suite.addTestSuite(Jbide1548Test.class); - suite.addTestSuite(JBIDE1713Test.class); +// suite.addTestSuite(RichFacesComponentTest.class); +// suite.addTestSuite(JBIDE1579Test.class); +// suite.addTestSuite(Jbide1580Test.class); +// suite.addTestSuite(JBIDE1613Test.class); +// suite.addTestSuite(Jbide1614Test.class); +// suite.addTestSuite(Jbide1639Test.class); +// suite.addTestSuite(Jbide1682Test.class); +// suite.addTestSuite(Jbide1548Test.class); +// suite.addTestSuite(JBIDE1713Test.class); // - suite.addTestSuite(RichFacesComboBoxTemplateTestCase.class); - suite.addTestSuite(RichFacesInplaceInputTemplateTestCase.class); - suite.addTestSuite(RichFacesInplaceSelectTemplateTestCase.class); +// suite.addTestSuite(RichFacesComboBoxTemplateTestCase.class); +// suite.addTestSuite(RichFacesInplaceInputTemplateTestCase.class); +// suite.addTestSuite(RichFacesInplaceSelectTemplateTestCase.class); suite.addTestSuite(RichFacesProgressBarTemplateTestCase.class); - suite.addTestSuite(RichFacesFileUploadTemplateTestCase.class); - suite.addTestSuite(RichFacesColumnsTemplateTestCase.class); - suite.addTestSuite(RichFacesPickListTemplateTestCase.class); +// suite.addTestSuite(RichFacesFileUploadTemplateTestCase.class); +// suite.addTestSuite(RichFacesColumnsTemplateTestCase.class); +// suite.addTestSuite(RichFacesPickListTemplateTestCase.class); // $JUnit-END$ List<ImportBean> projectToImport = new ArrayList<ImportBean>(); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesProgressBarTemplateTestCase.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesProgressBarTemplateTestCase.java 2008-06-06 13:23:22 UTC (rev 8609) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesProgressBarTemplateTestCase.java 2008-06-06 14:21:22 UTC (rev 8610) @@ -101,8 +101,7 @@ * Test simple. */ public void testSimple() { - baseTest(SIMPLE_PAGE, CHECK_BASE_STYLE, "text-align: left;", STYLE_CLASS_2,VpeStyleUtil.PARAMETER_WIDTH - + VpeStyleUtil.COLON_STRING + PERCENTAGES); + baseTest(SIMPLE_PAGE, CHECK_BASE_STYLE, "height: 13px; text-align: left;", STYLE_CLASS_2,"height: 13px; width: 60%;d"); } /** Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2008-06-06 13:23:22 UTC (rev 8609) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2008-06-06 14:21:22 UTC (rev 8610) @@ -15,7 +15,8 @@ org.eclipse.wst.sse.core, org.jboss.tools.jst.jsp, org.jboss.tools.common.text.ext, - org.jboss.tools.jst.web + org.jboss.tools.jst.web, + org.jboss.tools.vpe.ui.test Export-Package: org.jboss.tools.jst.jsp.test, org.jboss.tools.jst.jsp.test.ca Bundle-ClassPath: jst-jsp-test.jar

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8609 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: figures and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2008-06-06 09:23:22 -0400 (Fri, 06 Jun 2008) New Revision: 8609 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFeedbackFigure.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java Log: JBIDE-2280 gradient box instead of stickit note Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-06-06 12:36:20 UTC (rev 8608) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-06-06 13:23:22 UTC (rev 8609) @@ -162,7 +162,7 @@ protected void refreshVisuals() { Point loc = getExceptionModel().getLocation(); String text = getExceptionReadOnlyLabel(); - int width = getIconWidth()+FigureUtilities.getTextExtents(text, NodeFigure.exceptionFont).width; + int width = getIconWidth()+FigureUtilities.getTextExtents(text, NodeFigure.nodeLabelFont).width; size = new Dimension(width, getVisualHeight()); adjustForGrid(loc); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-06-06 12:36:20 UTC (rev 8608) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-06-06 13:23:22 UTC (rev 8609) @@ -165,7 +165,7 @@ if (getPageModel().getOutputLinks().size() == 0) height = 23 + NodeFigure.LINK_HEIGHT; - size = new Dimension(50, height); + size = new Dimension(getFigure().getPreferredSize().width, height); adjustForGrid(loc); Rectangle r = new Rectangle(loc, size); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-06-06 12:36:20 UTC (rev 8608) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-06-06 13:23:22 UTC (rev 8609) @@ -154,7 +154,7 @@ Point loc = getExceptionModel().getLocation(); String text = getExceptionModel().getName(); if(text == null) text="Param"; - int width = getIconWidth()+FigureUtilities.getTextExtents(text, NodeFigure.exceptionFont).width; + int width = getIconWidth()+FigureUtilities.getTextExtents(text, NodeFigure.nodeLabelFont).width; size = new Dimension(width, getVisualHeight()); adjustForGrid(loc); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java 2008-06-06 12:36:20 UTC (rev 8608) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java 2008-06-06 13:23:22 UTC (rev 8609) @@ -120,7 +120,7 @@ g.drawImage(icon, 4, 2); if(exc != null){ - g.setFont(exceptionFont); + g.setFont(nodeLabelFont); g.drawString(getExceptionReadOnlyLabel(), 27, 3); } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java 2008-06-06 12:36:20 UTC (rev 8608) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java 2008-06-06 13:23:22 UTC (rev 8609) @@ -66,7 +66,7 @@ public static final Color button3Color = new Color(null, 0xff, 0xe8, 0x79); public static final Color button4Color = new Color(null, 0xdb, 0xc7, 0x68); - public static final Font exceptionFont = new Font(null, "default", 8, SWT.BOLD); + public static final Font nodeLabelFont = new Font(null, "default", 10, SWT.BOLD); // TODO: use preference font mechanism for this public static final Image errorIcon = ModelUIImages .getImage("error_co.gif"); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFeedbackFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFeedbackFigure.java 2008-06-06 12:36:20 UTC (rev 8608) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFeedbackFigure.java 2008-06-06 13:23:22 UTC (rev 8609) @@ -33,7 +33,7 @@ g.fillRectangle(start+1,1,22,19); - g.fillPolygon(fillPointlist); + //g.fillPolygon(fillPointlist); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-06-06 12:36:20 UTC (rev 8608) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-06-06 13:23:22 UTC (rev 8609) @@ -1,337 +1,373 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.seam.ui.pages.editor.figures; - -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Image; - -import org.eclipse.draw2d.*; -import org.eclipse.draw2d.geometry.*; - -import org.eclipse.gef.handles.HandleBounds; - -import org.jboss.tools.common.gef.GEFGraphicalViewer; -import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page; -import org.jboss.tools.seam.ui.pages.editor.edit.PageEditPart; -import org.jboss.tools.seam.ui.pages.editor.figures.xpl.FixedConnectionAnchor; -import org.jboss.tools.seam.ui.pages.editor.print.PrintIconHelper; - -public class PageFigure extends NodeFigure implements HandleBounds, - FigureListener { - private static final Dimension SIZE = new Dimension(56, 100); - - private Image icon = null; - - public Page page; - - private Label label = null; - - PointList fillPointlist, fill2Pointlist, shadowPointlist, shadow2Pointlist; - - String path; - - PageEditPart editPart; - - public void setGroupEditPart(PageEditPart part) { - editPart = part; - } - - public void setBounds(Rectangle rect) { - super.setBounds(rect); - resizeFigure(); - } - - public void setConstraint(IFigure child, Object constraint) { - super.setConstraint(child, constraint); - } - - public void setPath(String path) { - this.path = path; - if (label != null) { - label.setText(path); - label.setSize(label.getPreferredSize()); - } - } - - public void refreshFont() { - if (label != null) { - //label.setFont(group.getJSFModel().getOptions().getViewPathFont()); - label.setSize(label.getPreferredSize()); - label.setLocation(new Point(getLocation().x - 5, getLocation().y - - (12 + 10))); - } - } - - public void setIcon(Image i) { - icon = PrintIconHelper.getPrintImage(i); - } - - public void addNotify() { - if (page == null) - return; - label = new Label(path); - //label.setFont(group.getJSFModel().getOptions().getViewPathFont()); - getParent().add(label); - label.setForegroundColor(ColorConstants.black); - label.setOpaque(false); - label.setText(path); - label.setVisible(true); - label.setSize(label.getPreferredSize()); - label.setLocation(new Point(getLocation().x - 5, getLocation().y - - (12 + 10))); - //label.addMouseListener(this); - } - - public void removeNotify() { - if (page == null) - return; - //label.removeMouseListener(this); - getParent().remove(label); - } - - public void figureMoved(IFigure source) { - if (page != null) - label.setLocation(new Point(getLocation().x - 5, - getLocation().y - 20)); - } - - public PageFigure(Page group) { - this.page = group; - - if (group != null) { - setIcon(group.getImage()); - setPath(group.getName()); - initConnectionAnchors(group.getOutputLinks().size()); - } - - setOpaque(false); - setLayoutManager(new XYLayout()); - - resizeFigure(); - addFigureListener(this); - //addKeyListener(this); - setBorder(new GroupBorder(blackColor)); - - if (group != null) { - FixedConnectionAnchor c; - c = new FixedConnectionAnchor(this); - c.offsetV = 8; - c.offsetH = -1; - connectionAnchors.put("1_IN", c); - inputConnectionAnchors.addElement(c); - - } - } - public ConnectionAnchor getConnectionAnchor(String terminal) { - ConnectionAnchor anchor = (ConnectionAnchor)connectionAnchors.get(terminal); - while(anchor == null){ - addConnectionAnchor(outputConnectionAnchors.size()); - anchor = (ConnectionAnchor)connectionAnchors.get(terminal); - } - return anchor; - } - /** - * @see org.eclipse.gef.handles.HandleBounds#getHandleBounds() - */ - public Rectangle getHandleBounds() { - return getBounds().getCropped(new Insets(0, 0, 0, 0)); - } - - /** - * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int) - */ - public Dimension getPreferredSize(int wHint, int hHint) { - return SIZE; - } - - int width, height; - - private void resizeFigure() { - if (width == getSize().width && height == getSize().height) - return; - - int start = 0; - width = getSize().width - 1; - height = getSize().height - 1; - - - fillPointlist = new PointList(); - - fillPointlist.addPoint(start, 20); - fillPointlist.addPoint(start + 23, 20); - fillPointlist.addPoint(start + 23, 0); - fillPointlist.addPoint(width - 15, 0); - fillPointlist.addPoint(width - 1, 14); - fillPointlist.addPoint(width - 1, height - 1); - fillPointlist.addPoint(start, height - 1); - - - - shadowPointlist = new PointList(); - - shadowPointlist.addPoint(width - 15, 0); - shadowPointlist.addPoint(width - 14, 4); - shadowPointlist.addPoint(width - 15, 7); - shadowPointlist.addPoint(width - 18, 10); - shadowPointlist.addPoint(width - 1, 14); - - shadowPointlist.addPoint(width - 9, 14); - shadowPointlist.addPoint(width - 16, 13); - - shadowPointlist.addPoint(width - 21, 11); - shadowPointlist.addPoint(width - 18, 8); - shadowPointlist.addPoint(width - 16, 4); - - shadow2Pointlist = new PointList(); - - shadow2Pointlist.addPoint(width - 15, 0); - shadow2Pointlist.addPoint(width - 1, 14); - shadow2Pointlist.addPoint(width - 3, 14); - shadow2Pointlist.addPoint(width - 15, 2); - } - - /** - * @see org.eclipse.draw2d.Figure#paintFigure(Graphics) - */ - protected void paintFigure(Graphics g) { - Rectangle r = getBounds().getCopy(); - g.translate(r.getLocation()); - - int height = r.height - 1; - int start = 0; - - - g.setBackgroundColor(whiteColor); - - g.fillRectangle(start + 1, 1, 22, 19); - - if (icon != null) - g.drawImage(icon, start + 4, 2); - - - if (page != null /*&& group.isConfirmed()*/) { - g.setBackgroundColor(yellowColor); - } else { - g.setBackgroundColor(lightGrayColor); - } - - g.fillPolygon(fillPointlist); - - - if (page != null /*&& group.isConfirmed()*/) { - g.setBackgroundColor(orangeColor); - } else { - g.setBackgroundColor(lightGrayColor); - } - - g.fillPolygon(shadowPointlist); - g.fillPolygon(shadow2Pointlist); - - if(page.getChildren().size() != 0){ - if(page.isParamsVisible()){ - g.setForegroundColor(blackColor); - g.drawLine(4, height-13, 11, height-13); - g.drawLine(4, height-13, 4, height-6); - - g.drawLine(6, height-9, 10, height-9); - - g.setForegroundColor(button2Color); - g.drawLine(12, height-13, 12, height-5); - g.drawLine(4, height-5, 12, height-5); - - g.setForegroundColor(button3Color); - g.setBackgroundColor(button3Color); - g.drawLine(5, height-4, 13, height-4); - g.drawLine(13, height-4, 13, height-12); - g.fillRectangle(6, height-11, 5, 2); - g.fillRectangle(6, height-8, 5, 2); - - g.setForegroundColor(button4Color); - g.drawLine(5, height-7, 5, height-12); - g.drawLine(5, height-12, 10, height-12); - }else{ - - g.setForegroundColor(button2Color); - g.drawLine(4, height-13, 11, height-13); - g.drawLine(4, height-13, 4, height-6); - - g.setForegroundColor(blackColor); - - g.drawLine(6, height-9, 10, height-9); - g.drawLine(8, height-11, 8, height-7); - - g.drawLine(12, height-13, 12, height-5); - g.drawLine(4, height-5, 12, height-5); - - g.setForegroundColor(button3Color); - g.drawLine(5, height-4, 13, height-4); - g.drawLine(13, height-4, 13, height-12); - - g.drawLine(6, height-6, 11, height-6); - g.drawLine(11, height-6, 11, height-12); - - g.setForegroundColor(whiteColor); - g.drawLine(5, height-6, 5, height-12); - g.drawLine(5, height-12, 11, height-12); - } - } - } - - class GroupBorder extends LineBorder { - public GroupBorder(Color color) { - super(color); - } - - public void paint(IFigure figure, Graphics graphics, Insets insets) { - Rectangle r = getPaintRectangle(figure, insets).getCopy(); - graphics.translate(r.getLocation()); - int width = r.width - 1; - int height = r.height - 1; - - if (page != null /*&& group.isConfirmed()*/) - graphics.setForegroundColor(blackColor); - else - graphics.setForegroundColor(darkGrayColor); - - graphics.drawLine(1, 0, width - 15, 0); - graphics.drawLine(0, 1, 0, height - 2); - graphics.drawLine(1, height - 1, width - 2, height - 1); - graphics.drawLine(width - 1, 14, width - 1, height - 2); - graphics.drawLine(width - 15, 0, width - 1, 14); - - graphics.drawLine(0, 1, 1, 0); - graphics.drawLine(0, height - 2, 1, height - 1); - graphics.drawLine(width - 2, height - 1, width - 1, height - 2); - - graphics.drawLine(width - 15, 0, width - 14, 4); - graphics.drawLine(width - 14, 4, width - 15, 7); - graphics.drawLine(width - 15, 7, width - 18, 10); - - graphics.drawLine(width - 18, 10, width - 1, 14); - - graphics.drawLine(23, 0, 23, 19); - graphics.drawLine(0, 20, 22, 20); - graphics.drawLine(22, 20, 23, 19); - } - - public void mouseDoubleClicked(MouseEvent me) { - } - - public void mousePressed(MouseEvent me) { - if (me.button == 3) { - ((GEFGraphicalViewer) editPart.getViewer()).setNoDeselect(); - editPart.getViewer().select(editPart); - } - } - - -} +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.ui.pages.editor.figures; + +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Pattern; +import org.eclipse.swt.widgets.Display; + +import org.eclipse.draw2d.*; +import org.eclipse.draw2d.geometry.*; + +import org.eclipse.gef.handles.HandleBounds; + +import org.jboss.tools.common.gef.GEFGraphicalViewer; +import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page; +import org.jboss.tools.seam.ui.pages.editor.edit.PageEditPart; +import org.jboss.tools.seam.ui.pages.editor.figures.xpl.FixedConnectionAnchor; +import org.jboss.tools.seam.ui.pages.editor.print.PrintIconHelper; + +public class PageFigure extends NodeFigure implements HandleBounds, + FigureListener { + private static final Dimension SIZE = new Dimension(56, 100); + + private Image icon = null; + + public Page page; + + private Label label = null; + + //PointList fillPointlist, fill2Pointlist, shadowPointlist, shadow2Pointlist; + + String path; + + PageEditPart editPart; + + public void setGroupEditPart(PageEditPart part) { + editPart = part; + } + + public void setBounds(Rectangle rect) { + super.setBounds(rect); + resizeFigure(); + + } + + public void setConstraint(IFigure child, Object constraint) { + super.setConstraint(child, constraint); + } + + public void setPath(String path) { + this.path = path; + if (label != null) { + label.setText(path); + label.setSize(label.getPreferredSize()); + } + } + + public void refreshFont() { + if (label != null) { + //label.setFont(group.getJSFModel().getOptions().getViewPathFont()); + label.setSize(label.getPreferredSize()); + label.setLocation(getLabelPosition()); + } + } + + private Point getLabelPosition() { + //return new Point(getLocation().x - 5, getLocation().y + // - (12 + 10)); + return new Point((getInsetX()*3)+ icon.getBounds().width + getLocation().x , getLocation().y + getInsetY()); + + } + + public void setIcon(Image i) { + icon = PrintIconHelper.getPrintImage(i); + } + + public void addNotify() { + if (page == null) + return; + label = new Label(path); + label.setFont(nodeLabelFont); + getParent().add(label); + label.setForegroundColor(ColorConstants.black); + label.setOpaque(false); + label.setText(path); + label.setVisible(true); + label.setSize(label.getPreferredSize()); + label.setLocation(getLabelPosition()); + //label.addMouseListener(this); + } + + public void removeNotify() { + if (page == null) + return; + //label.removeMouseListener(this); + getParent().remove(label); + } + + public void figureMoved(IFigure source) { + if (page != null) + label.setLocation(getLabelPosition()); + } + + public PageFigure(Page group) { + this.page = group; + + if (group != null) { + setIcon(group.getImage()); + setPath(group.getName()); + initConnectionAnchors(group.getOutputLinks().size()); + } + + setOpaque(false); + setLayoutManager(new XYLayout()); + + resizeFigure(); + addFigureListener(this); + //addKeyListener(this); + setBorder(new GroupBorder(blackColor)); + + if (group != null) { + FixedConnectionAnchor c; + c = new FixedConnectionAnchor(this); + c.offsetV = 8; + c.offsetH = -1; + connectionAnchors.put("1_IN", c); + inputConnectionAnchors.addElement(c); + + } + } + public ConnectionAnchor getConnectionAnchor(String terminal) { + ConnectionAnchor anchor = (ConnectionAnchor)connectionAnchors.get(terminal); + while(anchor == null){ + addConnectionAnchor(outputConnectionAnchors.size()); + anchor = (ConnectionAnchor)connectionAnchors.get(terminal); + } + return anchor; + } + /** + * @see org.eclipse.gef.handles.HandleBounds#getHandleBounds() + */ + public Rectangle getHandleBounds() { + return getBounds().getCropped(new Insets(0, 0, 0, 0)); + } + + /** + * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int) + */ + public Dimension getPreferredSize(int wHint, int hHint) { + return new Dimension(icon.getBounds().width + + label.getBounds().width + + 40 /** the bend corner width */, label.getBounds().height); + } + + int width, height; + + private void resizeFigure() { + if (width == getSize().width && height == getSize().height) + return; + + int start = 0; + width = getSize().width - 1; + height = getSize().height - 1; + + +// fillPointlist = new PointList(); +// +// fillPointlist.addPoint(start, 20); +// fillPointlist.addPoint(start + 23, 20); +// fillPointlist.addPoint(start + 23, 0); +// fillPointlist.addPoint(width - 15, 0); +// fillPointlist.addPoint(width - 1, 14); +// fillPointlist.addPoint(width - 1, height - 1); +// fillPointlist.addPoint(start, height - 1); +// +// +// +// shadowPointlist = new PointList(); +// +// shadowPointlist.addPoint(width - 15, 0); +// shadowPointlist.addPoint(width - 14, 4); +// shadowPointlist.addPoint(width - 15, 7); +// shadowPointlist.addPoint(width - 18, 10); +// shadowPointlist.addPoint(width - 1, 14); +// +// shadowPointlist.addPoint(width - 9, 14); +// shadowPointlist.addPoint(width - 16, 13); +// +// shadowPointlist.addPoint(width - 21, 11); +// shadowPointlist.addPoint(width - 18, 8); +// shadowPointlist.addPoint(width - 16, 4); +// +// shadow2Pointlist = new PointList(); +// +// shadow2Pointlist.addPoint(width - 15, 0); +// shadow2Pointlist.addPoint(width - 1, 14); +// shadow2Pointlist.addPoint(width - 3, 14); +// shadow2Pointlist.addPoint(width - 15, 2); + } + + /** + * @see org.eclipse.draw2d.Figure#paintFigure(Graphics) + */ + protected void paintFigure(Graphics g) { + Rectangle r = getBounds().getCopy(); + g.translate(r.getLocation()); + + int height = r.height - 1; + int start = 0; + + + g.setBackgroundColor(whiteColor); + + g.fillRectangle(start + 1, 1, 22, 190); // fill left part + + // drawIcon + if (icon != null) + g.drawImage(icon, start + getInsetX(), getInsetY()); + + + //color the page + if (page != null /*&& group.isConfirmed()*/) { + g.setBackgroundColor(new Color(null, 0xff, 0xff, 0xc2)); + } else { + g.setBackgroundColor(lightGrayColor); + } + + Rectangle boundingRect = new Rectangle(22, 1, r.width, r.height); + if(g instanceof ScaledGraphics) { + // scaled graphcis does not support gradients ;( + g.fillRectangle(boundingRect); + } else { + Display display = Display.getCurrent(); + + + Point topLeft = boundingRect.getTopLeft(); + Point bottomRight = boundingRect.getBottomRight(); + + Pattern pattern = new Pattern(display, topLeft.x, topLeft.y, + bottomRight.x, bottomRight.y, + ColorConstants.white, g.getBackgroundColor()); + g.setBackgroundPattern(pattern); + g.fillRectangle(boundingRect); + g.setBackgroundPattern(null); + pattern.dispose(); + } + + if(page.getChildren().size() != 0){ + if(page.isParamsVisible()){ + g.setForegroundColor(blackColor); + g.drawLine(4, height-13, 11, height-13); + g.drawLine(4, height-13, 4, height-6); + + g.drawLine(6, height-9, 10, height-9); + + g.setForegroundColor(button2Color); + g.drawLine(12, height-13, 12, height-5); + g.drawLine(4, height-5, 12, height-5); + + g.setForegroundColor(button3Color); + g.setBackgroundColor(button3Color); + g.drawLine(5, height-4, 13, height-4); + g.drawLine(13, height-4, 13, height-12); + g.fillRectangle(6, height-11, 5, 2); + g.fillRectangle(6, height-8, 5, 2); + + g.setForegroundColor(button4Color); + g.drawLine(5, height-7, 5, height-12); + g.drawLine(5, height-12, 10, height-12); + }else{ + + g.setForegroundColor(button2Color); + g.drawLine(4, height-13, 11, height-13); + g.drawLine(4, height-13, 4, height-6); + + g.setForegroundColor(blackColor); + + g.drawLine(6, height-9, 10, height-9); + g.drawLine(8, height-11, 8, height-7); + + g.drawLine(12, height-13, 12, height-5); + g.drawLine(4, height-5, 12, height-5); + + g.setForegroundColor(button3Color); + g.drawLine(5, height-4, 13, height-4); + g.drawLine(13, height-4, 13, height-12); + + g.drawLine(6, height-6, 11, height-6); + g.drawLine(11, height-6, 11, height-12); + + g.setForegroundColor(whiteColor); + g.drawLine(5, height-6, 5, height-12); + g.drawLine(5, height-12, 11, height-12); + } + } + } + + /** distance from e.g. icon to border Y-axis*/ + private int getInsetY() { + return 2; + } + + /** distance from e.g. icon to border X-axis*/ + private int getInsetX() { + return 4; + } + + /** the one drawing the "bend corner rectangle" **/ + class GroupBorder extends LineBorder { + public GroupBorder(Color color) { + super(color); + } + + public void paint(IFigure figure, Graphics graphics, Insets insets) { + Rectangle r = getPaintRectangle(figure, insets).getCopy(); + graphics.translate(r.getLocation()); + int width = r.width - 1; + int height = r.height - 1; + + if (page != null /*&& group.isConfirmed()*/) + graphics.setForegroundColor(blackColor); + else + graphics.setForegroundColor(darkGrayColor); + + graphics.drawLine(1, 0, width-1, 0); + graphics.drawLine(0, 1, 0, height - 1); + graphics.drawLine(1, height, width-1, height); + graphics.drawLine(width, 1, width, height - 1); + graphics.drawLine(23 , 0, 23, height); + + /*graphics.drawLine(1, 0, width - 15, 0); + graphics.drawLine(0, 1, 0, height - 2); + graphics.drawLine(1, height - 1, width - 2, height - 1); + graphics.drawLine(width - 1, 14, width - 1, height - 2); + graphics.drawLine(width - 15, 0, width - 1, 14); + + graphics.drawLine(0, 1, 1, 0); + graphics.drawLine(0, height - 2, 1, height - 1); + graphics.drawLine(width - 2, height - 1, width - 1, height - 2); + + graphics.drawLine(width - 15, 0, width - 14, 4); + graphics.drawLine(width - 14, 4, width - 15, 7); + graphics.drawLine(width - 15, 7, width - 18, 10); + + graphics.drawLine(width - 18, 10, width - 1, 14);*/ + + /*graphics.drawLine(23, 0, 23, 19); + graphics.drawLine(0, 20, 22, 20); + graphics.drawLine(22, 20, 23, 19);*/ + } + + public void mouseDoubleClicked(MouseEvent me) { + } + + public void mousePressed(MouseEvent me) { + if (me.button == 3) { + ((GEFGraphicalViewer) editPart.getViewer()).setNoDeselect(); + editPart.getViewer().select(editPart); + } + } + + +} } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-06-06 12:36:20 UTC (rev 8608) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-06-06 13:23:22 UTC (rev 8609) @@ -112,7 +112,7 @@ g.drawImage(icon, 4, 2); if(exc != null){ - g.setFont(exceptionFont); + g.setFont(nodeLabelFont); if(exc.getName() != null) g.drawString(exc.getName(), 27, 3); else

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8608 - trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2008-06-06 08:36:20 -0400 (Fri, 06 Jun 2008) New Revision: 8608 Modified: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css Log: http://jira.jboss.com/jira/browse/JBDS-336 - css correction Modified: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css =================================================================== --- trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css 2008-06-06 11:17:25 UTC (rev 8607) +++ trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css 2008-06-06 12:36:20 UTC (rev 8608) @@ -2,3 +2,33 @@ /* -----Override jbossorg.css----- */ +body { + background-image:url(../images/community/bkg_gradient.gif); + background-repeat:repeat-x; + text-align:center; + margin:0 auto; + padding:0; + } + +div.book{ + font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif; + font-size:12px; + margin:0; + padding:0em 2em; + color:#333; + line-height:150%; + text-align:justify; + width: 57em; + } + + div.chapter, #title{ + text-align:justify; + width: 57em; +} + +ul.docnav { + margin:0px; + width: 57em; + ! height:40px; + display:block; +} \ No newline at end of file

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8607 - in trunk/seam/plugins: org.jboss.tools.seam.ui.pages and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2008-06-06 07:17:25 -0400 (Fri, 06 Jun 2008) New Revision: 8607 Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/xpl/CompressNameUtil.java Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java Log: JBIDE-2280 exception figure made less bulky + svn ignore bin Property changes on: trunk/seam/plugins/org.jboss.tools.seam.pages.xml ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui.pages ___________________________________________________________________ Name: svn:ignore + bin Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-06-06 10:58:56 UTC (rev 8606) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-06-06 11:17:25 UTC (rev 8607) @@ -36,6 +36,7 @@ import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException; import org.jboss.tools.seam.ui.pages.editor.figures.ExceptionFigure; import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure; +import org.jboss.tools.seam.ui.pages.editor.figures.xpl.CompressNameUtil; public class ExceptionEditPart extends PagesEditPart implements PropertyChangeListener, EditPartListener, Adapter { private NodeFigure fig = null; @@ -148,10 +149,19 @@ + /** This returns the label to use when rendering the Exception in a readonly view. + * Converts org.model.Exception to o.m.Exception to save visual space + **/ + String getExceptionReadOnlyLabel() { + if(getElementModel()==null || getElementModel().getName() == null) { + return "Unknown Exception"; + } else { + return CompressNameUtil.getCompressedName(getElementModel().getName()); + } + } protected void refreshVisuals() { Point loc = getExceptionModel().getLocation(); - String text = getExceptionModel().getName(); - if(text == null) text="Exception"; + String text = getExceptionReadOnlyLabel(); int width = getIconWidth()+FigureUtilities.getTextExtents(text, NodeFigure.exceptionFont).width; size = new Dimension(width, getVisualHeight()); adjustForGrid(loc); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-06-06 10:58:56 UTC (rev 8606) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-06-06 11:17:25 UTC (rev 8607) @@ -153,7 +153,7 @@ protected void refreshVisuals() { Point loc = getExceptionModel().getLocation(); String text = getExceptionModel().getName(); - if(text == null) text="Exception"; + if(text == null) text="Param"; int width = getIconWidth()+FigureUtilities.getTextExtents(text, NodeFigure.exceptionFont).width; size = new Dimension(width, getVisualHeight()); adjustForGrid(loc); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java 2008-06-06 10:58:56 UTC (rev 8606) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java 2008-06-06 11:17:25 UTC (rev 8607) @@ -19,11 +19,14 @@ import org.eclipse.draw2d.geometry.Insets; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.handles.HandleBounds; +import org.eclipse.jdt.core.IPackageFragment; +import org.eclipse.jface.viewers.StyledString; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; import org.jboss.tools.common.gef.GEFGraphicalViewer; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException; import org.jboss.tools.seam.ui.pages.editor.edit.ExceptionEditPart; +import org.jboss.tools.seam.ui.pages.editor.figures.xpl.CompressNameUtil; import org.jboss.tools.seam.ui.pages.editor.figures.xpl.FixedConnectionAnchor; import org.jboss.tools.seam.ui.pages.editor.print.PrintIconHelper; @@ -118,15 +121,24 @@ if(exc != null){ g.setFont(exceptionFont); - if(exc.getName() != null) - g.drawString(exc.getName(), 27, 3); - else - g.drawString("Exception", 27, 3); + g.drawString(getExceptionReadOnlyLabel(), 27, 3); } } + /** This returns the label to use when rendering the Exception in a readonly view. + * Converts org.model.Exception to o.m.Exception to save visual space + **/ + String getExceptionReadOnlyLabel() { + if(exc==null || exc.getName() == null) { + return "Unknown Exception"; + } else { + return CompressNameUtil.getCompressedName(exc.getName()); + } + } + + class GroupBorder extends LineBorder { public GroupBorder(Color color) { super(color); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java 2008-06-06 10:58:56 UTC (rev 8606) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java 2008-06-06 11:17:25 UTC (rev 8607) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.pages.editor.figures; +import javax.swing.text.StyleConstants.ColorConstants; + import org.eclipse.draw2d.FigureUtilities; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; @@ -57,7 +59,7 @@ public static final Color exceptionBackgroundColor = new Color(null, 0xff, 0xe3, 0xe7); - public static final Color exceptionForegroundColor = new Color(null, 0x99, 0x07, 0x02); + public static final Color exceptionForegroundColor = blackColor; //new Color(null, 0x99, 0x07, 0x02); public static final Color button1Color = new Color(null, 0xff, 0xf6, 0xc8); public static final Color button2Color = new Color(null, 0x98, 0x99, 0x98); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-06-06 10:58:56 UTC (rev 8606) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-06-06 11:17:25 UTC (rev 8607) @@ -116,7 +116,7 @@ if(exc.getName() != null) g.drawString(exc.getName(), 27, 3); else - g.drawString("Exception", 27, 3); + g.drawString("Param", 27, 3); } Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/xpl/CompressNameUtil.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/xpl/CompressNameUtil.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/xpl/CompressNameUtil.java 2008-06-06 11:17:25 UTC (rev 8607) @@ -0,0 +1,72 @@ +package org.jboss.tools.seam.ui.pages.editor.figures.xpl; + +/** based on code in JavaElementLabel */ +public class CompressNameUtil { + + /* + * Package name compression + */ + private static String fgNamePattern= ""; //$NON-NLS-1$ + private static String fgNamePrefix; + private static String fgNamePostfix; + private static int fgNameChars; + private static int fgNameLength= -1; + + public static String getCompressedName(String className) { + StringBuffer result = new StringBuffer(); + refreshPackageNamePattern(); + if (fgNameLength == 0) { + result.append(className); + return result.toString(); + } + String name= className; + int start= 0; + int dot= name.indexOf('.', start); + while (dot > 0) { + if (dot - start > fgNameLength-1) { + result.append(fgNamePrefix); + if (fgNameChars > 0) + result.append(name.substring(start, Math.min(start+ fgNameChars, dot))); + result.append(fgNamePostfix); + } else + result.append(name.substring(start, dot + 1)); + start= dot + 1; + dot= name.indexOf('.', start); + } + result.append(name.substring(start)); + return result.toString(); + } + + private static void refreshPackageNamePattern() { + String pattern= "1.";//getPkgNamePatternForPackagesView(); TODO: put in a preference somewhere + final String EMPTY_STRING= ""; //$NON-NLS-1$ + if (pattern.equals(fgNamePattern)) + return; + else if (pattern.length() == 0) { + fgNamePattern= EMPTY_STRING; + fgNameLength= -1; + return; + } + fgNamePattern= pattern; + int i= 0; + fgNameChars= 0; + fgNamePrefix= EMPTY_STRING; + fgNamePostfix= EMPTY_STRING; + while (i < pattern.length()) { + char ch= pattern.charAt(i); + if (Character.isDigit(ch)) { + fgNameChars= ch-48; + if (i > 0) + fgNamePrefix= pattern.substring(0, i); + if (i >= 0) + fgNamePostfix= pattern.substring(i+1); + fgNameLength= fgNamePrefix.length() + fgNameChars + fgNamePostfix.length(); + return; + } + i++; + } + fgNamePrefix= pattern; + fgNameLength= pattern.length(); + } + +}

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8606 - in trunk/seam/plugins/org.jboss.tools.seam.pages.xml: resources/meta and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-06 06:58:56 -0400 (Fri, 06 Jun 2008) New Revision: 8606 Added: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/CreateSeamPagesSupport.java Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java Log: JBIDE-1189 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2008-06-06 10:35:25 UTC (rev 8605) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2008-06-06 10:58:56 UTC (rev 8606) @@ -57,6 +57,8 @@ <xclass id="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesFilteredTreeConstraint" class="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesFilteredTreeConstraint"/> + <xclass id="org.jboss.tools.seam.pages.xml.model.handlers.CreateSeamPagesSupport" + class="org.jboss.tools.seam.pages.xml.model.handlers.CreateSeamPagesSupport"/> <xclass id="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler" class="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler"/> <xclass id="org.jboss.tools.seam.pages.xml.model.handlers.AddExceptionHandler" Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-06-06 10:35:25 UTC (rev 8605) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-06-06 10:58:56 UTC (rev 8606) @@ -3148,7 +3148,7 @@ <XActionItem displayName="Seam" kind="list" name="Seam"> <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.new.seam.faces-config" - PROPERTIES="entity=FileSeamPages12;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=SeamPages" + PROPERTIES="entity=FileSeamPages12;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.seam.pages.xml.model.handlers.CreateSeamPagesSupport;extension=xml;entityVersion=SeamPages" displayName="Seam Pages File..." kind="action" name="CreateFileSeamPages"> <EntityData EntityName="NewFileWizard"> <AttributeData AttributeName="folder"/> @@ -3188,7 +3188,7 @@ <XActionItem displayName="Seam" kind="list" name="Seam"> <XActionItem HandlerClassName="%SpecialWizard%" ICON="action.new.seam.faces-config" - PROPERTIES="entity=FileSeamPages12;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=SeamPages" + PROPERTIES="entity=FileSeamPages12;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.seam.pages.xml.model.handlers.CreateSeamPagesSupport;extension=xml;entityVersion=SeamPages" displayName="Seam Pages File..." kind="action" name="CreateFileSeamPages"> <EntityData EntityName="NewFileWizard"> <AttributeData AttributeName="folder"/> Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java 2008-06-06 10:35:25 UTC (rev 8605) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java 2008-06-06 10:58:56 UTC (rev 8606) @@ -38,22 +38,22 @@ } protected void mergeAll(XModelObject f, boolean update) throws XModelException { - SeamPagesDiagramImpl process = (SeamPagesDiagramImpl)provideWebProcess(); - boolean b = (process != null && process.isPrepared()); - if(b) process.getHelper().addUpdateLock(this); + SeamPagesDiagramImpl diagram = (SeamPagesDiagramImpl)provideWebProcess(); + boolean b = (diagram != null && diagram.isPrepared()); + if(b) diagram.getHelper().addUpdateLock(this); merge(f, !update); if(b) { - process.getHelper().removeUpdateLock(this); - process.getHelper().updateDiagram(); + diagram.getHelper().removeUpdateLock(this); + diagram.getHelper().updateDiagram(); } - if(process != null) { - if(!process.isPrepared()/* || update*/ || isForceLoadOn()) { + if(diagram != null) { + if(!diagram.isPrepared()/* || update*/ || isForceLoadOn()) { XObjectLoader loader = XModelObjectLoaderUtil.getObjectLoader(this); ((WebProcessLoader)loader).reloadProcess(this); } - if(process.isPrepared()) - process.autolayout(); + if(diagram.isPrepared()) + diagram.autolayout(); } } Added: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/CreateSeamPagesSupport.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/CreateSeamPagesSupport.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/CreateSeamPagesSupport.java 2008-06-06 10:58:56 UTC (rev 8606) @@ -0,0 +1,30 @@ +package org.jboss.tools.seam.pages.xml.model.handlers; + +import java.util.Properties; + +import org.jboss.tools.common.model.XModelException; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.files.handlers.CreateFileSupport; +import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; +import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl; + +public class CreateSeamPagesSupport extends CreateFileSupport { + + public CreateSeamPagesSupport() {} + + protected void execute() throws XModelException { + Properties p = extractStepData(0); + String path = p.getProperty("name"); + path = revalidatePath(path); + XModelObject file = createFile(path); + if(file == null) return; + + SeamPagesDiagramImpl diagram = (SeamPagesDiagramImpl)file.getChildByPath(SeamPagesConstants.ELM_DIAGRAM); + diagram.firePrepared(); + +// register(file.getParent(), file, p0); + + open(file); + } + +} Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java 2008-06-06 10:35:25 UTC (rev 8605) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java 2008-06-06 10:58:56 UTC (rev 8606) @@ -66,19 +66,19 @@ */ } - private void addRuleByPageAdopt(XModelObject process, XModelObject page, Properties p) throws XModelException { + private void addRuleByPageAdopt(XModelObject diagram, XModelObject page, Properties p) throws XModelException { String path = XModelObjectLoaderUtil.getResourcePath(page); - XModelObject pageItem = SeamPagesDiagramHelper.getHelper(process).getPage(path); + XModelObject pageItem = SeamPagesDiagramHelper.getHelper(diagram).getPage(path); if(pageItem != null) return; boolean doNotCreateEmptyRule = false; //or read preferences, compare JSF - pageItem = SeamPagesDiagramHelper.getHelper(process).findOrCreateItem(path, null, TYPE_PAGE); + pageItem = SeamPagesDiagramHelper.getHelper(diagram).findOrCreateItem(path, null, TYPE_PAGE); setShape(pageItem, p); if(doNotCreateEmptyRule) { pageItem.setAttributeValue("persistent", "true"); pageItem.setModified(true); } else { - XModelObject pages = process.getParent().getChildByPath(FOLDER_PAGES); - String suffix = getPageSuffix(process.getParent().getModelEntity().getName()); + XModelObject pages = diagram.getParent().getChildByPath(FOLDER_PAGES); + String suffix = getPageSuffix(diagram.getParent().getModelEntity().getName()); XModelObject rule = pages.getModel().createModelObject(ENT_SEAM_PAGE + suffix, null); rule.setAttributeValue(ATTR_VIEW_ID, path); DefaultCreateHandler.addCreatedObject(pages, rule, p); Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java 2008-06-06 10:35:25 UTC (rev 8605) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java 2008-06-06 10:58:56 UTC (rev 8606) @@ -22,8 +22,8 @@ return p; } - public XModelObject[] getItems(XModelObject process) { - return process.getChildren(ENT_DIAGRAM_ITEM); + public XModelObject[] getItems(XModelObject diagram) { + return diagram.getChildren(ENT_DIAGRAM_ITEM); } public XModelObject[] getOutputs(XModelObject item) {

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8605 - trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2008-06-06 06:35:25 -0400 (Fri, 06 Jun 2008) New Revision: 8605 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java Log: JBIDE-2262:add jbossws facet install page to let users select a ws runtime----- fix a compile error Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2008-06-06 10:28:28 UTC (rev 8604) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2008-06-06 10:35:25 UTC (rev 8605) @@ -11,6 +11,7 @@ package org.jboss.tools.ws.creation.ui.project.facet; import java.util.ArrayList; +import java.util.Arrays; import java.util.EventObject; import java.util.List; import java.util.Map; @@ -183,8 +184,6 @@ protected void initializeRuntimesCombo(Combo cmRuntime) { cmRuntime.removeAll(); - Map<String, JbossWSRuntime> mpRuntimes = JbossWSCoreUtils - .getJbossWSRutntimeMap(); JbossWSRuntime[] runtimes = JbossWSRuntimeManager.getInstance() .getRuntimes(); for (int i = 0; i < runtimes.length; i++) { @@ -203,9 +202,9 @@ * create a new jbossws runtime and set user supplied runtime to the new one */ protected void newJBossWSRuntime() { - List<JbossWSRuntime> exists = new ArrayList<JbossWSRuntime>(); + List<JbossWSRuntime> exists = new ArrayList<JbossWSRuntime>(Arrays.asList(JbossWSRuntimeManager.getInstance().getRuntimes())); List<JbossWSRuntime> added = new ArrayList<JbossWSRuntime>(); - exists.addAll(JbossWSCoreUtils.getJbossWSRutntimeMap().values()); + JbossRuntimeListFieldEditor.JbossWSRuntimeNewWizard newRtwizard = new JbossRuntimeListFieldEditor.JbossWSRuntimeNewWizard( exists, added) { public boolean performFinish() {

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r8604 - in trunk/ws/plugins: org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2008-06-06 06:28:28 -0400 (Fri, 06 Jun 2008) New Revision: 8604 Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java Log: JBIDE-2262:add jbossws facet install page to let users select a ws runtime Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java 2008-06-06 10:08:38 UTC (rev 8603) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java 2008-06-06 10:28:28 UTC (rev 8604) @@ -38,7 +38,6 @@ public class JbossWSClassPathCommand extends AbstractDataModelOperation { IProject project; - String runtimeLocation; private IDataModel model; public JbossWSClassPathCommand(IProject project, IDataModel model) { @@ -53,28 +52,48 @@ public IStatus executeOverride(IProgressMonitor monitor) { IStatus status = Status.OK_STATUS; - try{ - boolean isServerSupplied = model.getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED); - if(isServerSupplied){ - QualifiedName serverSupplied_qn = new QualifiedName(IJBossWSFacetDataModelProperties.QUALIFIEDNAME_IDENTIFIER_IS_SERVER_SUPPLIED, IJBossWSFacetDataModelProperties.PERSISTENT_PROPERTY_IS_SERVER_SUPPLIED_RUNTIME); - project.setPersistentProperty(serverSupplied_qn, "1"); - } - status = addClassPath(project); - }catch(CoreException e){ + try { + boolean isServerSupplied = model + .getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED); + if (isServerSupplied) { + QualifiedName serverSupplied_qn = new QualifiedName( + IJBossWSFacetDataModelProperties.QUALIFIEDNAME_IDENTIFIER_IS_SERVER_SUPPLIED, + IJBossWSFacetDataModelProperties.PERSISTENT_PROPERTY_IS_SERVER_SUPPLIED_RUNTIME); + project.setPersistentProperty(serverSupplied_qn, "1"); + } else { + // store runtime name and runtime location to the project + QualifiedName qRuntimeName = new QualifiedName( + IJBossWSFacetDataModelProperties.QUALIFIEDNAME_IDENTIFIER_IS_SERVER_SUPPLIED, + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID); + QualifiedName qRuntimeLocation = new QualifiedName( + IJBossWSFacetDataModelProperties.QUALIFIEDNAME_IDENTIFIER_IS_SERVER_SUPPLIED, + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID); + String runtimeName = model + .getStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID); + String runtimeLocation = model + .getStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME); + project.setPersistentProperty(qRuntimeName, runtimeName); + project + .setPersistentProperty(qRuntimeLocation, + runtimeLocation); + status = addClassPath(project, runtimeName); + } + + } catch (CoreException e) { status = StatusUtils.errorStatus( JbossWSCoreMessages.ERROR_ADD_FACET_JBOSSWS, e); } return status; } - public IStatus addClassPath(IProject project) { + public IStatus addClassPath(IProject project, String segment) { IStatus status = Status.OK_STATUS; try { IJavaProject javaProject = JavaCore.create(project); IClasspathEntry newClasspath = JavaCore.newContainerEntry(new Path( - JbossWSCoreMessages.JBossWS_Runtime_Lib)); + JbossWSCoreMessages.JBossWS_Runtime_Lib).append(segment)); IClasspathEntry[] oldClasspathEntries = javaProject .readRawClasspath(); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-06-06 10:08:38 UTC (rev 8603) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-06-06 10:28:28 UTC (rev 8604) @@ -1,6 +1,6 @@ Label_Custom_Package_Name=Custom package name Label_Catalog_File=Catalog file -Label_Button_Text_Seletion= &Add +Label_Button_Text_Seletion= &Add Label_Binding_File=Binding files Label_JaxWS_Target=JAX-WS specification Value_Target_0=2.0 @@ -21,4 +21,12 @@ Client_Sample_Package_Name=.clientsample Client_Sample_Class_Name=ClientSample Error_Create_Client_Sample=When create a client sample, a error comes up. Please check the generated files. -WebEndpoint=WebEndpoint \ No newline at end of file +WebEndpoint=WebEndpoint + +Error_WS_Chose_runtime=Select an JBoss Web Service runtime. If a server supplied JBoss Web Service runtime is chosen , the chosen server adapter must be capable of providing the JBoss Web Service runtime +Error_WS_No_Runtime_Specifed=A JBossWS runtime has not been chosen +JBossWSFacetInstallPage_Title=JBossWS Facet +JBossWSFacetInstallPage_Description=Select JBossWS Web Service runtime +JBossWSFacetInstallPage_ServerSuppliedJBossWS=Server Supplied JBossWS Runtime +JBossWSFacetInstallPage_Deploy=Deploy +JBossWSFacetInstallPage_New=New... Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-06-06 10:08:38 UTC (rev 8603) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-06-06 10:28:28 UTC (rev 8604) @@ -5,6 +5,16 @@ public class JBossWSCreationCoreMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.ws.creation.core.messages.JBossWSCreationCore"; //$NON-NLS-1$ + public static String JBossWSFacetInstallPage_Deploy; + + public static String JBossWSFacetInstallPage_Description; + + public static String JBossWSFacetInstallPage_New; + + public static String JBossWSFacetInstallPage_ServerSuppliedJBossWS; + + public static String JBossWSFacetInstallPage_Title; + public static String Label_Custom_Package_Name; public static String Label_Catalog_File; public static String Label_Button_Text_Seletion; @@ -18,11 +28,14 @@ public static String Error_Read_Binding_File; public static String Separator_Java; + public static String Error_Implemetation_Code_Generation; public static String Error_No_Annotation; public static String WebserviceClient_Annotation; public static String Error_No_Class; public static String Error_WS_Location; + public static String Error_WS_No_Runtime_Specifed; + public static String Error_WS_Chose_runtime; public static String Webservice_Annotation_Check; public static String Webservice_Annotation; public static String Client_Sample_Package_Name; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2008-06-06 10:08:38 UTC (rev 8603) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2008-06-06 10:28:28 UTC (rev 8604) @@ -34,8 +34,11 @@ import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage; import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage; import org.jboss.tools.ws.core.classpath.JbossWSRuntime; +import org.jboss.tools.ws.core.classpath.JbossWSRuntimeManager; import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties; +import org.jboss.tools.ws.core.messages.JbossWSCoreMessages; import org.jboss.tools.ws.core.utils.JbossWSCoreUtils; +import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages; import org.jboss.tools.ws.ui.preferences.JbossRuntimeListFieldEditor; /** @@ -50,151 +53,203 @@ private Combo cmbRuntimes; private Button btnDeploy; private Button btnNew; - - private IDataModel model; - + + private IDataModel model; + public JBossWSFacetInstallPage() { - super("JBossWS Facet"); - setTitle("JBossWS Facet"); - setDescription("Select JBossWS Web Service runtime"); + super(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Title); + setTitle(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Title); + setDescription(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Description); } public void setConfig(Object config) { - this.model = (IDataModel)config; - + this.model = (IDataModel) config; + } public void createControl(Composite parent) { initializeDialogUnits(parent); Composite composite = new Composite(parent, SWT.NONE); - GridLayout gridLayout = new GridLayout(4, false); composite.setLayout(gridLayout); - + btnServerSupplied = new Button(composite, SWT.RADIO); - btnServerSupplied.addSelectionListener(new SelectionAdapter(){ + btnServerSupplied.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { setServerSuppliedSelection(e); - } + } }); GridData gd = new GridData(); gd.horizontalSpan = 1; btnServerSupplied.setLayoutData(gd); - + Label lblServerSupplied = new Label(composite, SWT.NONE); - lblServerSupplied.addMouseListener(new MouseAdapter(){ + lblServerSupplied.addMouseListener(new MouseAdapter() { public void mouseDown(MouseEvent e) { btnServerSupplied.setSelection(true); setServerSuppliedSelection(e); } }); - lblServerSupplied.setText("Server Supplied JBossWS Runtime"); + lblServerSupplied.setText(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_ServerSuppliedJBossWS); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 3; lblServerSupplied.setLayoutData(gd); - + btnUserSupplied = new Button(composite, SWT.RADIO); - btnUserSupplied.addSelectionListener(new SelectionAdapter(){ + btnUserSupplied.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { setUserSuppliedSelection(e); - } + } }); - - + cmbRuntimes = new Combo(composite, SWT.READ_ONLY); initializeRuntimesCombo(cmbRuntimes); cmbRuntimes.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - cmbRuntimes.addSelectionListener(new SelectionAdapter(){ + cmbRuntimes.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - String runtimeName = cmbRuntimes.getText(); - JbossWSRuntime jr = (JbossWSRuntime)cmbRuntimes.getData(runtimeName); - model.setStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, jr.getHomeDir()); - model.setStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, runtimeName); + String runtimeName = cmbRuntimes.getText(); + JbossWSRuntime jr = (JbossWSRuntime) cmbRuntimes + .getData(runtimeName); + model.setStringProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, + jr.getHomeDir()); + model.setStringProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, + runtimeName); } }); - + btnDeploy = new Button(composite, SWT.CHECK); - btnDeploy.setText("Deploy"); - btnDeploy.addSelectionListener(new SelectionAdapter(){ + btnDeploy.setText(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Deploy); + btnDeploy.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - model.setBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY, btnDeploy.getSelection()); + model.setBooleanProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY, + btnDeploy.getSelection()); } }); - + btnNew = new Button(composite, SWT.NONE); - btnNew.setText("New..."); - btnNew.addSelectionListener(new SelectionAdapter(){ + btnNew.setText(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_New); + btnNew.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { newJBossWSRuntime(); } }); - + setControl(composite); - - - - + changePageStatus(); + } protected void setServerSuppliedSelection(EventObject e) { + btnServerSupplied.setSelection(true); btnUserSupplied.setSelection(false); - model.setBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED, true); + model + .setBooleanProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED, + true); enableUserSupplied(false); - + changePageStatus(); + } - + protected void setUserSuppliedSelection(EventObject e) { btnServerSupplied.setSelection(false); - model.setBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED, false); + btnUserSupplied.setSelection(true); + model + .setBooleanProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED, + false); String runtimeId = cmbRuntimes.getText(); - model.setStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, runtimeId); + model + .setStringProperty( + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, + runtimeId); enableUserSupplied(true); - + changePageStatus(); + } - - protected void enableUserSupplied(boolean enabled){ + + protected void enableUserSupplied(boolean enabled) { cmbRuntimes.setEnabled(enabled); btnDeploy.setEnabled(enabled); btnNew.setEnabled(enabled); - + } - protected void initializeRuntimesCombo(Combo cmRuntime){ - Map<String, JbossWSRuntime> mpRuntimes = JbossWSCoreUtils.getJbossWSRutntimeMap(); - int i = -1; - for(String key: mpRuntimes.keySet()){ - i++; - JbossWSRuntime jr = mpRuntimes.get(key); + protected void initializeRuntimesCombo(Combo cmRuntime) { + cmRuntime.removeAll(); + Map<String, JbossWSRuntime> mpRuntimes = JbossWSCoreUtils + .getJbossWSRutntimeMap(); + JbossWSRuntime[] runtimes = JbossWSRuntimeManager.getInstance() + .getRuntimes(); + for (int i = 0; i < runtimes.length; i++) { + JbossWSRuntime jr = runtimes[i]; cmRuntime.add(jr.getName()); cmRuntime.setData(jr.getName(), jr.getHomeDir()); - - //get default jbossws runtime - if(jr.isDefault()){ + + // get default jbossws runtime + if (jr.isDefault()) { cmRuntime.select(i); } } } - + /* - * create a new jbossws runtime and set user supplied runtime to the new one + * create a new jbossws runtime and set user supplied runtime to the new one */ - protected void newJBossWSRuntime(){ + protected void newJBossWSRuntime() { List<JbossWSRuntime> exists = new ArrayList<JbossWSRuntime>(); List<JbossWSRuntime> added = new ArrayList<JbossWSRuntime>(); exists.addAll(JbossWSCoreUtils.getJbossWSRutntimeMap().values()); - JbossRuntimeListFieldEditor.JbossWSRuntimeNewWizard newRtwizard = new JbossRuntimeListFieldEditor.JbossWSRuntimeNewWizard(exists, added); - WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), newRtwizard); - if(dialog.open() == dialog.OK){ + JbossRuntimeListFieldEditor.JbossWSRuntimeNewWizard newRtwizard = new JbossRuntimeListFieldEditor.JbossWSRuntimeNewWizard( + exists, added) { + public boolean performFinish() { + JbossWSRuntime rt = getRuntime(); + JbossWSRuntimeManager.getInstance().addRuntime(rt); + JbossWSRuntimeManager.getInstance().save(); + + return true; + } + }; + WizardDialog dialog = new WizardDialog(Display.getCurrent() + .getActiveShell(), newRtwizard); + if (dialog.open() == dialog.OK) { initializeRuntimesCombo(cmbRuntimes); cmbRuntimes.select(cmbRuntimes.getItemCount() - 1); } } - + + protected void changePageStatus() { + if (btnUserSupplied.getSelection() + && cmbRuntimes.getSelectionIndex() == -1) { + setErrorMessage(JBossWSCreationCoreMessages.Error_WS_No_Runtime_Specifed); + } else if (!btnUserSupplied.getSelection() + && !btnServerSupplied.getSelection()) { + setErrorMessage(JBossWSCreationCoreMessages.Error_WS_Chose_runtime); + }else{ + setErrorMessage(null); + } + setPageComplete(isPageComplete()); + } + + @Override + public boolean isPageComplete() { + if (btnServerSupplied.getSelection() + || (btnUserSupplied.getSelection() && cmbRuntimes + .getSelectionIndex() != -1)) { + return true; + } else { + return false; + } + } + public void propertyChanged(DataModelEvent event) { - + } } \ No newline at end of file Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-06 10:08:38 UTC (rev 8603) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-06 10:28:28 UTC (rev 8604) @@ -621,6 +621,10 @@ return true; } + protected JbossWSRuntime getRuntime(){ + return page1.getRuntime(); + } + } /**

15 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2008