Author: dgeraskov
Date: 2012-07-31 03:39:47 -0400 (Tue, 31 Jul 2012)
New Revision: 42799
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/UIMessages.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
Log:
https://issues.jboss.org/browse/JBIDE-11883
Fix ui messages problem and close progress monitor
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java
===================================================================
---
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java 2012-07-31
04:47:44 UTC (rev 42798)
+++
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java 2012-07-31
07:39:47 UTC (rev 42799)
@@ -47,7 +47,7 @@
private List<IResource> javaFilesToAdd;
public AddGeneratedClassesJob(JpaProject jpaProject, List<IResource>
javaFilesToAdd) {
- super(Messages.SYNC_CLASSES_JOB);
+ super(UIMessages.SYNC_CLASSES_JOB);
IResourceRuleFactory ruleFactory = ResourcesPlugin.getWorkspace().getRuleFactory();
setRule(ruleFactory.modifyRule(jpaProject.getProject()));
this.jpaProject = jpaProject;
@@ -59,7 +59,7 @@
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
- final SubMonitor sm = SubMonitor.convert(monitor, Messages.SYNC_CLASSES_TASK, 20);
+ final SubMonitor sm = SubMonitor.convert(monitor, UIMessages.SYNC_CLASSES_TASK, 20);
final JpaXmlResource resource = jpaProject.getPersistenceXmlResource();
if (resource == null) {
//the resource would only be null if the persistence.xml file had an invalid content
type
@@ -86,6 +86,7 @@
IStatus status = addNewClassRefs(sm.newChild(17), jpaProject, persistenceUnit);
resource.save();
+ sm.done();
return status;
}
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
===================================================================
---
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2012-07-31
04:47:44 UTC (rev 42798)
+++
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2012-07-31
07:39:47 UTC (rev 42799)
@@ -45,9 +45,5 @@
public static final String NAME_CANT_BE_EMPTY =
"NAME_CANT_BE_EMPTY";//$NON-NLS-1$
public static final String TYPE_DEF_DUPLICATE_NAME=
"TYPE_DEF_DUPLICATE_NAME";//$NON-NLS-1$
-
- public static final String SYNC_CLASSES_JOB =
"SYNC_CLASSES_JOB";//$NON-NLS-1$
-
- public static final String SYNC_CLASSES_TASK =
"SYNC_CLASSES_TASK";//$NON-NLS-1$
}
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/UIMessages.java
===================================================================
---
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/UIMessages.java
(rev 0)
+++
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/UIMessages.java 2012-07-31
07:39:47 UTC (rev 42799)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.jpt.core.internal.context;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Dmitry Geraskov (geraskov(a)gmail.com)
+ *
+ */
+public class UIMessages extends NLS {
+
+ private static final String BUNDLE_NAME =
"org.jboss.tools.hibernate.jpt.core.internal.context.Messages";//$NON-NLS-1$
+
+ public static String SYNC_CLASSES_JOB;
+
+ public static String SYNC_CLASSES_TASK;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, UIMessages.class);
+ }
+}