Skip to content

Commit 4468dd6

Browse files
sschulz92sschulz92
authored
Remove default TODO messages and fix several line mixtures (#482)
1 parent ce05c92 commit 4468dd6

File tree

42 files changed

+1153
-1475
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1153
-1475
lines changed

‎plugins/org.locationtech.udig.catalog.geotools/src/org/locationtech/udig/catalog/geotools/process/LocalProcessFolder.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class LocalProcessFolder implements IResolve {
3939
/**
4040
* LocalProcessFolder constructor with package visibility as it should only be constructed by
4141
* LocalProcessService.
42-
*
42+
*
4343
* @param service
4444
* @param factory
4545
*/
@@ -48,7 +48,7 @@ public class LocalProcessFolder implements IResolve {
4848
this.factory = factory;
4949
this.id = new ID( service.getID() + "/" + factory.getClass().getSimpleName(), "local" );
5050
}
51-
51+
5252
public ProcessFactory getFactory() {
5353
return factory;
5454
}
@@ -137,7 +137,6 @@ public String getTitle() {
137137
}
138138

139139
public void dispose( IProgressMonitor monitor ) {
140-
// TODO Auto-generated method stub
141140

142141
}
143142

‎plugins/org.locationtech.udig.catalog.geotools/src/org/locationtech/udig/catalog/geotools/process/LocalProcessService.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
/**
3232
* Gathers up all ProcessFactories findable by GeoTools into the local catalog.
33-
*
33+
*
3434
* @author Jody Garnett (LISAsoft)
3535
* @since 1.2.0
3636
*/
@@ -40,7 +40,7 @@ public class LocalProcessService extends IService {
4040
* ID used for geotools processes
4141
*/
4242
public final static String ID = "process:///localhost/geotools/process"; //$NON-NLS-1$
43-
43+
4444
/** Service ID used for GeoTools processes */
4545
public final static ID SERVICE_ID = new ID(ID,"geotools");
4646

@@ -55,7 +55,7 @@ public Map<String, Serializable> getConnectionParams() {
5555
params.put(LocalProcessServiceExtension.KEY, SERVICE_ID.toURL() );
5656
return params;
5757
}
58-
58+
5959
public Status getStatus() {
6060
if( folders == null ){
6161
return super.getStatus();
@@ -71,7 +71,7 @@ public Throwable getMessage() {
7171
public org.locationtech.udig.catalog.ID getID() {
7272
return SERVICE_ID;
7373
}
74-
74+
7575
public URL getIdentifier() {
7676
return SERVICE_ID.toURL();
7777
}
@@ -83,11 +83,11 @@ public synchronized List<IResolve> members( IProgressMonitor monitor ) throws IO
8383
for( ProcessFactory factory : Processors.getProcessFactories() ){
8484
LocalProcessFolder folder = new LocalProcessFolder(this, factory );
8585
folders.add( folder );
86-
}
86+
}
8787
}
8888
return folders;
8989
}
90-
90+
9191
/**
9292
* This service does not provide any spatial data.
9393
* @return null, as this service does not provide any spatial data
@@ -99,7 +99,6 @@ public List<? extends IGeoResource> resources( IProgressMonitor monitor ) throws
9999

100100
@Override
101101
protected IServiceInfo createInfo( IProgressMonitor monitor ) throws IOException {
102-
// TODO Auto-generated method stub
103102
return null;
104103
}
105104

‎plugins/org.locationtech.udig.catalog.jgrass/src/org/locationtech/udig/catalog/jgrass/activeregion/dialogs/CatalogJGrassMapsetsTreeViewer.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* JGrass - Free Open Source Java GIS http://www.jgrass.org
3-
* (C) HydroloGIS - www.hydrologis.com
2+
* JGrass - Free Open Source Java GIS http://www.jgrass.org
3+
* (C) HydroloGIS - www.hydrologis.com
44
*
55
* All rights reserved. This program and the accompanying materials
66
* are made available under the terms of the Eclipse Public License v1.0
@@ -49,7 +49,7 @@
4949
* This class supplies a tree viewer containing the JGrass mapsets that are in the catalog When a
5050
* mapset is selected it is passed to the WidgetObservers that are registered with this class.
5151
* </p>
52-
*
52+
*
5353
* @author Andrea Antonello - www.hydrologis.com
5454
* @since 1.1.0
5555
*/
@@ -119,7 +119,7 @@ public void selectionChanged( SelectionChangedEvent event ) {
119119
private class ContentProvider implements ITreeContentProvider {
120120
/**
121121
* Gets the children of the specified object
122-
*
122+
*
123123
* @param arg0 the parent object
124124
* @return Object[]
125125
*/
@@ -171,7 +171,7 @@ private Object[] filteredLayers( List<IResolve> layers ) {
171171
}
172172
/**
173173
* Gets the parent of the specified object
174-
*
174+
*
175175
* @param arg0 the object
176176
* @return Object
177177
*/
@@ -190,7 +190,7 @@ public Object getParent( Object arg0 ) {
190190

191191
/**
192192
* Returns whether the passed object has children
193-
*
193+
*
194194
* @param arg0 the parent object
195195
* @return boolean
196196
*/
@@ -205,7 +205,7 @@ public boolean hasChildren( Object arg0 ) {
205205

206206
/**
207207
* Gets the root element(s) of the tree
208-
*
208+
*
209209
* @param arg0 the input data
210210
* @return Object[]
211211
*/
@@ -241,7 +241,7 @@ public void dispose() {
241241

242242
/**
243243
* Called when the input changes
244-
*
244+
*
245245
* @param arg0 the viewer
246246
* @param arg1 the old input
247247
* @param arg2 the new input
@@ -297,7 +297,7 @@ public LabelProvider() {
297297

298298
/**
299299
* Gets the image to display for a node in the tree
300-
*
300+
*
301301
* @param arg0 the node
302302
* @return Image
303303
*/
@@ -313,7 +313,7 @@ public Image getImage( Object arg0 ) {
313313

314314
/**
315315
* Gets the text to display for a node in the tree
316-
*
316+
*
317317
* @param arg0 the node
318318
* @return String
319319
*/
@@ -335,7 +335,7 @@ public String getText( Object arg0 ) {
335335

336336
/**
337337
* Adds a listener to this label provider
338-
*
338+
*
339339
* @param arg0 the listener
340340
*/
341341
public void addListener( ILabelProviderListener arg0 ) {
@@ -354,7 +354,7 @@ public void dispose() {
354354
/**
355355
* Returns whether changes to the specified property on the specified element would affect
356356
* the label for the element
357-
*
357+
*
358358
* @param arg0 the element
359359
* @param arg1 the property
360360
* @return boolean
@@ -365,7 +365,7 @@ public boolean isLabelProperty( Object arg0, String arg1 ) {
365365

366366
/**
367367
* Removes the listener
368-
*
368+
*
369369
* @param arg0 the listener to remove
370370
*/
371371
public void removeListener( ILabelProviderListener arg0 ) {
@@ -378,7 +378,6 @@ public List<JGrassMapsetGeoResource> getSelectedLayers() {
378378
}
379379

380380
public int getType() {
381-
// TODO Auto-generated method stub
382381
return 0;
383382
}
384383

‎plugins/org.locationtech.udig.catalog.teradata/src/org/locationtech/udig/catalog/teradata/Activator.java‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -82,32 +82,31 @@ protected org.eclipse.swt.widgets.Control createDialogArea(
8282
layout.verticalSpacing = 0;
8383
comp.setLayout(layout);
8484
Control msg;
85-
try {
85+
try {
8686
Browser browser = new Browser(comp, SWT.NONE);
8787
browser.setText(String.format(htmlForm,Messages.GetHTMLDriverMsg));
88-
msg = browser;
89-
browser.addLocationListener(new LocationListener() {
90-
88+
msg = browser;
89+
browser.addLocationListener(new LocationListener() {
90+
9191
@Override
9292
public void changing(LocationEvent event) {
9393
event.doit = false;
9494
org.eclipse.swt.program.Program.launch(event.location);
95-
95+
9696
}
97-
97+
9898
@Override
9999
public void changed(LocationEvent event) {
100-
// TODO Auto-generated method stub
101-
100+
102101
}
103102
});
104-
} catch (SWTError e) {
103+
} catch (SWTError e) {
105104
Text text = new Text(comp, SWT.MULTI
106105
| SWT.READ_ONLY | SWT.WRAP | SWT.BORDER
107106
| SWT.SHADOW_IN);
108107
text.setText(Messages.GetDriverMsg);
109108
msg = text;
110-
}
109+
}
111110
GridDataFactory.fillDefaults().span(2, 1)
112111
.hint(500, 200).applyTo(msg);
113112
area(path, JDBC_FILE_NAME, comp);
@@ -124,7 +123,7 @@ public Text area(String defaultPath,
124123

125124
@Override
126125
public void handleEvent(Event event) {
127-
path = text1.getText();
126+
path = text1.getText();
128127
updateRestart();
129128
}
130129

@@ -204,7 +203,7 @@ public void start(BundleContext context) throws Exception {
204203

205204
/*
206205
* (non-Javadoc)
207-
*
206+
*
208207
* @see
209208
* org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
210209
* )
@@ -232,7 +231,7 @@ public void run() {
232231

233232
File newPlugin;
234233
boolean needUserCopy;
235-
234+
236235
File requiredPluginDir = new File(pluginsDir, pluginName);
237236
try {
238237
newPlugin = requiredPluginDir;
@@ -246,7 +245,7 @@ public void run() {
246245

247246
final String dest = new File(newPlugin,"libs").getPath();
248247
final File finalNewPlugin = newPlugin;
249-
248+
250249
transfer(dest, JDBC_FILE_NAME, dialog);
251250
transfer(dest, CONFIG_FILE_NAME, dialog);
252251

@@ -255,25 +254,25 @@ public void run() {
255254
Dialog dialog2 = new Dialog(shell) {
256255
protected Control createDialogArea(Composite parent) {
257256
Control comp;
258-
try {
259-
Browser browser = new Browser(parent, SWT.NONE);
260-
261-
String mainMessage = String.format(Messages.GetHTMLCopyPluginMsg,finalNewPlugin.getParentFile().getAbsolutePath(), finalNewPlugin.getAbsolutePath(), pluginsDir.getAbsolutePath());
262-
browser.setText(mainMessage);
263-
browser.addLocationListener(new LocationListener() {
264-
265-
@Override
266-
public void changing(LocationEvent event) {
267-
event.doit = false;
268-
org.eclipse.swt.program.Program.launch(event.location);
269-
}
270-
271-
@Override
272-
public void changed(LocationEvent event) {
273-
}
274-
});
275-
comp = browser;
276-
} catch (SWTError e) {
257+
try {
258+
Browser browser = new Browser(parent, SWT.NONE);
259+
260+
String mainMessage = String.format(Messages.GetHTMLCopyPluginMsg,finalNewPlugin.getParentFile().getAbsolutePath(), finalNewPlugin.getAbsolutePath(), pluginsDir.getAbsolutePath());
261+
browser.setText(mainMessage);
262+
browser.addLocationListener(new LocationListener() {
263+
264+
@Override
265+
public void changing(LocationEvent event) {
266+
event.doit = false;
267+
org.eclipse.swt.program.Program.launch(event.location);
268+
}
269+
270+
@Override
271+
public void changed(LocationEvent event) {
272+
}
273+
});
274+
comp = browser;
275+
} catch (SWTError e) {
277276
Text text = new Text(parent, SWT.MULTI
278277
| SWT.READ_ONLY | SWT.WRAP | SWT.BORDER
279278
| SWT.SHADOW_IN);
@@ -282,24 +281,24 @@ public void changed(LocationEvent event) {
282281
text.setText(mainMessage);
283282
comp = text;
284283
}
285-
GridDataFactory.fillDefaults().hint(500, 200).applyTo(comp);
284+
GridDataFactory.fillDefaults().hint(500, 200).applyTo(comp);
286285

287-
return comp;
286+
return comp;
288287
};
289288
@Override
290289
protected Button createButton(Composite parent,
291290
int id, String label, boolean defaultButton) {
292291
Button button = super.createButton(parent, id,label, defaultButton);
293292
if (id == Window.OK) button.setText("Restart");
294-
293+
295294
return button;
296295
}
297296
};
298-
297+
299298
if(dialog2.open() == Window.CANCEL) return;
300299
}
301300
}
302-
301+
303302
String cmd = buildCommandLine(shell);
304303
if (cmd != null) {
305304
System.setProperty(PROP_EXIT_CODE, Integer.toString(24));
@@ -315,7 +314,7 @@ protected Button createButton(Composite parent,
315314

316315
public File findPluginsDir() throws IOException {
317316
Bundle bundle = Platform.getBundle(GEOTOOLS_LIBS_PLUGIN);
318-
317+
319318
String filePath = FileLocator.toFileURL(FileLocator.find(bundle, new Path("glib"), new HashMap<String, String>())).getFile();
320319
return new File(filePath).getParentFile().getParentFile();
321320
}
@@ -326,7 +325,7 @@ private void transfer(String dest, String driver, LicenseDialog dialog)
326325
RandomAccessFile in = null;
327326
try {
328327
String fromPath = new File(dialog.getPath(),driver).getPath();
329-
328+
330329
String toPath = new File(dest, driver).getPath();
331330
out = new RandomAccessFile(toPath, "rw");
332331
in = new RandomAccessFile(fromPath.trim(), "r");
@@ -385,7 +384,7 @@ protected static void createPluginStructure(File newPlugin) throws IOException {
385384
* Create and return a string with command line options for eclipse.exe that
386385
* will launch a new workbench that is the same as the currently running
387386
* one, but using the argument directory as its workspace.
388-
*
387+
*
389388
* @param workspace
390389
* the directory to use as the new workspace
391390
* @return a string of command line options or null on error
@@ -437,7 +436,7 @@ private static String buildCommandLine(Shell shell) {
437436

438437
/**
439438
* Returns the shared instance
440-
*
439+
*
441440
* @return the shared instance
442441
*/
443442
public static Activator getDefault() {

0 commit comments

Comments
 (0)