Skip to content

Commit d9bd735

Browse files
committed
Fix configuration transformation jobs
* Job names are end user visible in the Eclipse UI, therefore just taking some unique identifier without meaning is not correct. * Always initialize the progress reporting, even if there is nothing to count. * add icon via job family registration
1 parent 60caf70 commit d9bd735

File tree

4 files changed

+32
-7
lines changed

4 files changed

+32
-7
lines changed

net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/Messages.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,9 @@ private Messages() {
110110

111111
public static String PartsOpenedJob_title;
112112

113+
public static String TransformCheckstyleRulesJob_name;
114+
115+
public static String TransformFormatterRulesJob_name;
116+
113117
// CHECKSTYLE:ON
114118
}

net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/TransformCheckstyleRulesJob.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.util.List;
3232

3333
import net.sf.eclipsecs.core.CheckstylePlugin;
34+
import net.sf.eclipsecs.core.Messages;
3435
import net.sf.eclipsecs.core.config.CheckstyleConfigurationFile;
3536
import net.sf.eclipsecs.core.config.ICheckConfiguration;
3637
import net.sf.eclipsecs.core.config.configtypes.IContextAware;
@@ -46,6 +47,7 @@
4647
import org.eclipse.core.runtime.IProgressMonitor;
4748
import org.eclipse.core.runtime.IStatus;
4849
import org.eclipse.core.runtime.Status;
50+
import org.eclipse.core.runtime.SubMonitor;
4951
import org.xml.sax.InputSource;
5052

5153
/**
@@ -66,14 +68,15 @@ public class TransformCheckstyleRulesJob extends WorkspaceJob {
6668
* The current selected project in the workspace.
6769
*/
6870
public TransformCheckstyleRulesJob(final IProject project) {
69-
super("transformCheckstyle");
71+
super(Messages.TransformCheckstyleRulesJob_name);
7072

7173
this.mProject = project;
7274
}
7375

7476
@Override
75-
public IStatus runInWorkspace(final IProgressMonitor arg0) throws CoreException {
76-
77+
public IStatus runInWorkspace(final IProgressMonitor monitor) throws CoreException {
78+
SubMonitor subMonitor = SubMonitor.convert(monitor);
79+
subMonitor.setWorkRemaining(IProgressMonitor.UNKNOWN);
7780
try {
7881
final IProjectConfiguration conf = ProjectConfigurationFactory.getConfiguration(mProject);
7982

@@ -135,4 +138,10 @@ private static void recurseConfiguration(Configuration module, List<Configuratio
135138
}
136139
}
137140
}
141+
142+
@Override
143+
public boolean belongsTo(Object family) {
144+
return AbstractCheckJob.CHECKSTYLE_JOB_FAMILY.equals(family) || super.belongsTo(family);
145+
}
146+
138147
}

net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/jobs/TransformFormatterRulesJob.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.io.FileNotFoundException;
2424

2525
import net.sf.eclipsecs.core.CheckstylePlugin;
26+
import net.sf.eclipsecs.core.Messages;
2627
import net.sf.eclipsecs.core.transformer.FormatterConfigParser;
2728
import net.sf.eclipsecs.core.transformer.FormatterConfiguration;
2829
import net.sf.eclipsecs.core.transformer.FormatterTransformer;
@@ -34,6 +35,7 @@
3435
import org.eclipse.core.runtime.IProgressMonitor;
3536
import org.eclipse.core.runtime.IStatus;
3637
import org.eclipse.core.runtime.Status;
38+
import org.eclipse.core.runtime.SubMonitor;
3739

3840
/**
3941
* Job who starts transforming the formatter-rules to checkstyle-settings.
@@ -47,18 +49,20 @@ public class TransformFormatterRulesJob extends WorkspaceJob {
4749
* Job for transforming formatter-rules to checkstyle-settings.
4850
*/
4951
public TransformFormatterRulesJob() {
50-
super("transformFormatter");
52+
super(Messages.TransformFormatterRulesJob_name);
5153
}
5254

5355
@Override
54-
public IStatus runInWorkspace(final IProgressMonitor arg0) throws CoreException {
56+
public IStatus runInWorkspace(final IProgressMonitor monitor) throws CoreException {
57+
SubMonitor subMonitor = SubMonitor.convert(monitor);
58+
subMonitor.setWorkRemaining(IProgressMonitor.UNKNOWN);
5559

5660
// TODO this way of loading formatter profiles is very dubious, to say
5761
// the least, refer to FormatterConfigWriter for a better API
5862
final String workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
5963

6064
final String configLocation = workspace
61-
+ "/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs";
65+
+ "/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs"; //$NON-NLS-1$
6266

6367
FormatterConfigParser parser = null;
6468

@@ -75,7 +79,7 @@ public IStatus runInWorkspace(final IProgressMonitor arg0) throws CoreException
7579

7680
try {
7781
FormatterTransformer transformer = new FormatterTransformer(rules);
78-
transformer.transformRules(workspace + "/test-checkstyle.xml");
82+
transformer.transformRules(workspace + "/test-checkstyle.xml"); //$NON-NLS-1$
7983
} catch (CheckstylePluginException ex) {
8084
Status status = new Status(IStatus.ERROR, CheckstylePlugin.PLUGIN_ID, IStatus.ERROR,
8185
ex.getMessage(), ex);
@@ -84,4 +88,10 @@ public IStatus runInWorkspace(final IProgressMonitor arg0) throws CoreException
8488

8589
return Status.OK_STATUS;
8690
}
91+
92+
@Override
93+
public boolean belongsTo(Object family) {
94+
return AbstractCheckJob.CHECKSTYLE_JOB_FAMILY.equals(family) || super.belongsTo(family);
95+
}
96+
8797
}

net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/messages.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,5 @@ RemoteConfigurationType_msgRemoteCachingFailed = Could not cache remote configur
3333
RemoteConfigurationType_msgUnAuthorized = 401: Authentication failed
3434
RunCheckstyleOnFilesJob_title = Checkstyle
3535
SimpleFileSetsEditor_nameAllFileset = all
36+
TransformCheckstyleRulesJob_name=Convert Checkstyle rules
37+
TransformFormatterRulesJob_name=Convert formatter settings

0 commit comments

Comments
 (0)