Skip to content

Commit 066ebb3

Browse files
author
gbr
committed
Quiet dev diagnostic logging.
1 parent 4720de2 commit 066ebb3

File tree

10 files changed

+32
-30
lines changed

10 files changed

+32
-30
lines changed

net.certiv.tools.indentguide.feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="net.certiv.tools.indentguide.feature"
44
label="IndentGuide"
5-
version="2.2.4.qualifier"
5+
version="2.2.5.qualifier"
66
provider-name="Certiv Analytis">
77

88
<description>

net.certiv.tools.indentguide.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>net.certiv</groupId>
1111
<artifactId>net.certiv.tools.indentguide.parent</artifactId>
12-
<version>2.2.4-SNAPSHOT</version>
12+
<version>2.2.5-SNAPSHOT</version>
1313
</parent>
1414

1515
<artifactId>net.certiv.tools.indentguide.feature</artifactId>

net.certiv.tools.indentguide.plugin.test/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: tychotest.test
44
Bundle-Vendor: tychotest
55
Bundle-SymbolicName: net.certiv.tools.indentguide.plugin.test
6-
Bundle-Version: 2.2.4.qualifier
6+
Bundle-Version: 2.2.5.qualifier
77
Fragment-Host: net.certiv.tools.indentguide;bundle-version="2.1.0.qualifier"
88
Bundle-RequiredExecutionEnvironment: JavaSE-11
99
Require-Bundle: junit-jupiter-api

net.certiv.tools.indentguide.plugin.test/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>net.certiv</groupId>
1010
<artifactId>net.certiv.tools.indentguide.parent</artifactId>
11-
<version>2.2.4-SNAPSHOT</version>
11+
<version>2.2.5-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>net.certiv.tools.indentguide.plugin.test</artifactId>

net.certiv.tools.indentguide.plugin/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: IndentGuide
44
Bundle-SymbolicName: net.certiv.tools.indentguide;singleton:=true
5-
Bundle-Version: 2.2.4.qualifier
5+
Bundle-Version: 2.2.5.qualifier
66
Bundle-Activator: net.certiv.tools.indentguide.Activator
77
Bundle-Vendor: Certiv Analytics
88
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.24.100,4.0.0)",

net.certiv.tools.indentguide.plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>net.certiv</groupId>
1111
<artifactId>net.certiv.tools.indentguide.parent</artifactId>
12-
<version>2.2.4-SNAPSHOT</version>
12+
<version>2.2.5-SNAPSHOT</version>
1313
</parent>
1414

1515
<artifactId>net.certiv.tools.indentguide</artifactId>

net.certiv.tools.indentguide.plugin/src/main/java/net/certiv/tools/indentguide/Starter.java

+15-12
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ private IContentType typeOf(AbstractTextEditor editor) {
175175
IDocumentProvider provider = editor.getDocumentProvider();
176176
if (provider instanceof IDocumentProviderExtension4) {
177177
try {
178-
IContentType type = ((IDocumentProviderExtension4) provider).getContentType(editor.getEditorInput());
178+
IContentType type = ((IDocumentProviderExtension4) provider)
179+
.getContentType(editor.getEditorInput());
179180
if (type != null) return type;
180181
} catch (CoreException e) {
181182
Activator.log(e);
@@ -245,7 +246,7 @@ public void partOpened(IWorkbenchPartReference ref) {
245246
IWorkbenchPart part = ref.getPart(false);
246247
if (part instanceof MultiPageEditorPart || part instanceof AbstractTextEditor) {
247248
installPainter(part);
248-
Activator.log("part opened '%s'", Utils.nameOf(part));
249+
// Activator.log("part opened '%s'", Utils.nameOf(part));
249250
}
250251
}
251252

@@ -254,15 +255,16 @@ public void partClosed(IWorkbenchPartReference ref) {
254255
IWorkbenchPart part = ref.getPart(false);
255256
if (part instanceof MultiPageEditorPart || part instanceof AbstractTextEditor) {
256257
deactivate(part);
257-
Activator.log("part closed '%s'", Utils.nameOf(part));
258+
// Activator.log("part closed '%s'", Utils.nameOf(part));
258259
}
259260
}
260261

261262
@Override
262263
public void pageChanged(PageChangedEvent evt) {
263264
IPageChangeProvider provider = evt.getPageChangeProvider();
264265
if (provider instanceof MultiPageEditorPart) {
265-
Activator.log("MultiPageEditor page change '%s'", Utils.nameOf(provider));
266+
// Activator.log("MultiPageEditor page change '%s'",
267+
// Utils.nameOf(provider));
266268
installPainter((IWorkbenchPart) provider);
267269
}
268270
}
@@ -277,12 +279,12 @@ public void propertyChange(PropertyChangeEvent evt) {
277279
Object now = evt.getNewValue();
278280

279281
if (prop.equals(IThemeManager.CHANGE_CURRENT_THEME)) {
280-
Activator.log("theme change '%s' [%s] => [%s]", prop, old, now);
282+
// Activator.log("theme change '%s' [%s] => [%s]", prop, old, now);
281283
refreshAll();
282284

283285
} else if (prop.startsWith(Pref.KEY)) {
284286
if (prop.equals(Pref.ENABLED)) {
285-
Activator.log("status change '%s' [%s] => [%s]", prop, old, now);
287+
// Activator.log("status change '%s' [%s] => [%s]", prop, old, now);
286288
if ((boolean) now) {
287289
initWorkbenchWindows();
288290

@@ -294,7 +296,8 @@ public void propertyChange(PropertyChangeEvent evt) {
294296
updateContentTypes();
295297

296298
// Note: logic is reversed because it is an exclusion list
297-
Delta<String> delta = Delta.of(Utils.undelimit((String) now), Utils.undelimit((String) old));
299+
Delta<String> delta = Delta.of(Utils.undelimit((String) now),
300+
Utils.undelimit((String) old));
298301
if (delta.changed()) {
299302
MsgBuilder mb = new MsgBuilder("content type change [%s]", prop);
300303

@@ -311,8 +314,8 @@ public void propertyChange(PropertyChangeEvent evt) {
311314
Activator.log(mb.toString());
312315
}
313316

314-
} else {
315-
Activator.log("property change '%s' [%s] => [%s]", prop, old, now);
317+
// } else {
318+
// Activator.log("property change '%s' [%s] => [%s]", prop, old, now);
316319
}
317320

318321
refreshAll();
@@ -326,19 +329,19 @@ private class Data {
326329
IContentType type;
327330
ISourceViewer viewer;
328331
GuidePainter painter;
329-
332+
330333
Data(IWorkbenchPart part, AbstractTextEditor editor, IContentType type, ISourceViewer viewer) {
331334
this.part = part;
332335
this.editor = editor;
333336
this.type = type;
334337
this.viewer = viewer;
335338
}
336-
339+
337340
@Override
338341
public int hashCode() {
339342
return Objects.hash(part, editor);
340343
}
341-
344+
342345
@Override
343346
public boolean equals(Object obj) {
344347
if (this == obj) return true;

net.certiv.tools.indentguide.plugin/src/main/java/net/certiv/tools/indentguide/painter/GuidePainter.java

+9-10
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import net.certiv.tools.indentguide.Activator;
2828
import net.certiv.tools.indentguide.preferences.Pref;
29-
import net.certiv.tools.indentguide.util.MsgBuilder;
3029
import net.certiv.tools.indentguide.util.Utils;
3130

3231
/**
@@ -180,7 +179,7 @@ private void drawLineRange(GC gc, int begLine, int endLine, int x, int w) {
180179
currLn.stops.clear();
181180
currLn.stops.addAll(prevNb.stops);
182181

183-
log(currLn.delta, prevNb, currLn, nextNb);
182+
// log(currLn.delta, prevNb, currLn, nextNb);
184183

185184
// adjust stops dependent on delta
186185
if (currLn.delta < 0 && currLn.tabs() > 1) {
@@ -329,12 +328,12 @@ private void disposeLineColor() {
329328
@Override
330329
public void setPositionManager(IPaintPositionManager manager) {}
331330

332-
void log(int delta, Line prevNb, Line currLn, Line nextNb) {
333-
Activator.log(new MsgBuilder() //
334-
.nl().append("Delta: %s", delta) //
335-
.nl().append("PrevNb: %s", prevNb) //
336-
.nl().append("CurrLn: %s", currLn) //
337-
.nl().append("NextNb: %s", nextNb)) //
338-
;
339-
}
331+
// void log(int delta, Line prevNb, Line currLn, Line nextNb) {
332+
// Activator.log(new MsgBuilder() //
333+
// .nl().append("Delta: %s", delta) //
334+
// .nl().append("PrevNb: %s", prevNb) //
335+
// .nl().append("CurrLn: %s", currLn) //
336+
// .nl().append("NextNb: %s", nextNb)) //
337+
// ;
338+
// }
340339
}

net.certiv.tools.indentguide.site/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>net.certiv</groupId>
1111
<artifactId>net.certiv.tools.indentguide.parent</artifactId>
12-
<version>2.2.4-SNAPSHOT</version>
12+
<version>2.2.5-SNAPSHOT</version>
1313
</parent>
1414

1515
<artifactId>net.certiv.tools.indentguide.site</artifactId>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<groupId>net.certiv</groupId>
1010
<artifactId>net.certiv.tools.indentguide.parent</artifactId>
11-
<version>2.2.4-SNAPSHOT</version>
11+
<version>2.2.5-SNAPSHOT</version>
1212

1313
<name>IndentGuide</name>
1414
<description>IndentGuide</description>

0 commit comments

Comments
 (0)