Skip to content

Commit 419b03e

Browse files
author
jan
committed
Externalized string and added debug; console does not work properly
I'm trying to get the console to work properly for this. That is a set enabled (currently always on) and have the console at the fingertips of the user (does not seem to work right now)
1 parent 685ab31 commit 419b03e

File tree

3 files changed

+30
-32
lines changed

3 files changed

+30
-32
lines changed

‎io.sloeber.autoBuild/src/io/sloeber/autoBuild/core/Messages.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public class Messages extends NLS {
2020
public static String ManagedMakeBuilder_message_no_build;
2121
public static String ManagedMakeBuilder_message_error;
2222
public static String ManagedMakeBuilder_message_error_build;
23-
// public static String ManagedMakeBuilder_message_error_refresh;
2423
public static String ManagedMakeBuilder_message_undefined_build_command;
2524
public static String ManagedMakeBuilder_message_finished;
2625
public static String ManagedMakeBuilder_message_cancelled;
@@ -122,7 +121,6 @@ public class Messages extends NLS {
122121
public static String GeneratedMakefileBuilder_cleanSelectedFiles;
123122
public static String FolderInfo_4;
124123
public static String GnuLinkOutputNameProvider_0;
125-
public static String CommonBuilder_1;
126124
public static String CommonBuilder_2;
127125
public static String CommonBuilder_6;
128126
public static String CommonBuilder_7;
@@ -140,18 +138,22 @@ public class Messages extends NLS {
140138
public static String ResourceChangeHandler2_0;
141139
public static String ToolInfo_0;
142140
public static String ToolInfo_1;
143-
public static String AbstractBuiltinSpecsDetector_AddScannerDiscoveryMarkers;
144141
public static String AbstractBuiltinSpecsDetector_ClearingMarkers;
145142
public static String AbstractBuiltinSpecsDetector_DiscoverBuiltInSettingsJobName;
146-
public static String AbstractBuiltinSpecsDetector_RunningScannerDiscovery;
147-
public static String AbstractBuiltinSpecsDetector_ScannerDiscoveryMarkerLocationPreferences;
148-
public static String AbstractBuiltinSpecsDetector_ScannerDiscoveryMarkerLocationProperties;
149143
public static String AbstractBuiltinSpecsDetector_ScannerDiscoveryTaskTitle;
150144
public static String AbstractBuiltinSpecsDetector_SerializingResults;
151145
public static String ExternalBuilderName;
152146
public static String InternalBuilderName;
153147

154148
public static String InternalBuildRunner_NoNeedToRun;
149+
150+
public static String ScannerDiscoveryMarkerLocationPreferences;
151+
152+
public static String ScannerDiscoveryMarkerLocationProperties;
153+
154+
public static String AddScannerDiscoveryMarkers;
155+
156+
public static String RunningScannerDiscovery;
155157
static {
156158
// initialize resource bundle
157159
NLS.initializeMessages(BUNDLE_NAME, Messages.class);

‎io.sloeber.autoBuild/src/io/sloeber/autoBuild/core/messages.properties

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ CfgScannerConfigUtil_ErrorNotSupported=Only type {0} is supported in this method
150150
GeneratedMakefileBuilder_cleanSelectedFiles=Cleaning Selected Files
151151
FolderInfo_4=converter invocation failed
152152
GnuLinkOutputNameProvider_0=tool parent must be one of configuration, toolchain, or resource configuration
153-
CommonBuilder_1=customized builder created for builder that does not support customization
154153
CommonBuilder_2=request for building non active configuration for the builder that does not support this
155154
CommonBuilder_6=Time consumed: {0} ms. \u0020
156155
CommonBuilder_7=Info: Parallel threads used: {0}
@@ -171,17 +170,16 @@ ToolInfo_0=conversion failure
171170
ToolInfo_1=the tool is removed
172171

173172
#Language settings providers messages
174-
AbstractBuiltinSpecsDetector_AddScannerDiscoveryMarkers=Adding Scanner Discovery markers
173+
AddScannerDiscoveryMarkers=Adding Scanner Discovery markers
175174
AbstractBuiltinSpecsDetector_ClearingMarkers=Clearing markers for {0}
176175
AbstractBuiltinSpecsDetector_DiscoverBuiltInSettingsJobName=Discover compiler built-in language settings
177-
AbstractBuiltinSpecsDetector_RunningScannerDiscovery=Running scanner discovery: {0}
178-
AbstractBuiltinSpecsDetector_ScannerDiscoveryMarkerLocationPreferences=Preferences, C++/Build/Settings/Discovery, [{0}] options
179-
AbstractBuiltinSpecsDetector_ScannerDiscoveryMarkerLocationProperties=Project Properties, C++ Preprocessor Include.../Providers, [{0}] options
176+
RunningScannerDiscovery=Running scanner discovery: {0}
177+
ScannerDiscoveryMarkerLocationPreferences=Preferences, C++/Build/Settings/Discovery, [{0}] options
178+
ScannerDiscoveryMarkerLocationProperties=Project Properties, C++ Preprocessor Include.../Providers, [{0}] options
180179
AbstractBuiltinSpecsDetector_ScannerDiscoveryTaskTitle=CDT Scanner Discovery
181180
AbstractBuiltinSpecsDetector_SerializingResults=Serializing results
182181

183182

184-
185183
ExternalBuilderName=Make builder
186184
InternalBuilderName=Internal builder
187-
InternalBuildRunner_NoNeedToRun=No need to run
185+
InternalBuildRunner_NoNeedToRun=No need to run

‎io.sloeber.autoBuild/src/io/sloeber/autoBuild/internal/AutoBuildLanguageSettingsProvider.java

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.File;
2020
import java.io.IOException;
2121
import java.net.URL;
22+
import java.text.MessageFormat;
2223
import java.util.ArrayList;
2324
import java.util.HashMap;
2425
import java.util.LinkedList;
@@ -65,6 +66,7 @@
6566
import io.sloeber.autoBuild.api.AutoBuildCommon;
6667
import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
6768
import io.sloeber.autoBuild.core.Activator;
69+
import io.sloeber.autoBuild.core.Messages;
6870
import io.sloeber.autoBuild.extensionPoint.providers.InternalBuildRunner;
6971
import io.sloeber.autoBuild.schema.api.IOption;
7072

@@ -74,8 +76,8 @@
7476
public class AutoBuildLanguageSettingsProvider extends AbstractExecutableExtensionBase
7577
implements ILanguageSettingsBroadcastingProvider {
7678

77-
private static final String SCANNER_DISCOVERY_CONSOLE = "org.eclipse.cdt.managedbuilder.ScannerDiscoveryConsole"; //$NON-NLS-1$
78-
private static final String SCANNER_DISCOVERY_GLOBAL_CONSOLE = "org.eclipse.cdt.managedbuilder.ScannerDiscoveryGlobalConsole"; //$NON-NLS-1$
79+
private static final String SCANNER_DISCOVERY_CONSOLE = "io.Sloeber.autoBuild.ScannerDiscoveryConsole"; //$NON-NLS-1$
80+
private static final String SCANNER_DISCOVERY_GLOBAL_CONSOLE = "io.Sloeber.autoBuild.ScannerDiscoveryGlobalConsole"; //$NON-NLS-1$
7981
private static final String DEFAULT_CONSOLE_ICON = "icons/obj16/inspect_sys.gif"; //$NON-NLS-1$
8082
private static final String GMAKE_ERROR_PARSER_ID = "org.eclipse.cdt.core.GmakeErrorParser"; //$NON-NLS-1$
8183

@@ -101,10 +103,10 @@ public void addMarker(IResource rc, int lineNumber, String errorDesc, int severi
101103
@Override
102104
public void addMarker(final ProblemMarkerInfo problemMarkerInfo) {
103105
final String providerId = getId();
106+
final String providerName=getName();
104107
// Add markers in a job to avoid deadlocks
105108
Job markerJob = new Job(
106-
// ManagedMakeMessages.getResourceString(
107-
"AbstractBuiltinSpecsDetector.AddScannerDiscoveryMarkers") { //$NON-NLS-1$
109+
Messages.AddScannerDiscoveryMarkers) {
108110
@Override
109111
protected IStatus run(IProgressMonitor monitor) {
110112
// Avoid duplicates as different languages can generate identical errors
@@ -133,14 +135,12 @@ protected IStatus run(IProgressMonitor monitor) {
133135
marker.setAttribute(SDMarkerGenerator.ATTR_PROVIDER, providerId);
134136

135137
if (problemMarkerInfo.file instanceof IWorkspaceRoot) {
136-
String msgPreferences = // ManagedMakeMessages.getFormattedString(
137-
"AbstractBuiltinSpecsDetector.ScannerDiscoveryMarkerLocationPreferences";
138-
// , //$NON-NLS-1$ providerName);
138+
String msgPreferences = MessageFormat.format(
139+
Messages.ScannerDiscoveryMarkerLocationPreferences, providerName);
139140
marker.setAttribute(IMarker.LOCATION, msgPreferences);
140141
} else {
141-
String msgProperties = // ManagedMakeMessages.getFormattedString(
142-
"AbstractBuiltinSpecsDetector.ScannerDiscoveryMarkerLocationProperties";
143-
// //$NON-NLS-1$ providerName);
142+
String msgProperties = MessageFormat.format(
143+
Messages.ScannerDiscoveryMarkerLocationProperties, providerName);
144144
marker.setAttribute(IMarker.LOCATION, msgProperties);
145145
}
146146
} catch (CoreException e) {
@@ -298,10 +298,8 @@ private List<ICLanguageSettingEntry> runForLanguage(String currentLanguageId, St
298298

299299
try (AutoBuildRunnerHelper buildRunnerHelper = new AutoBuildRunnerHelper(currentProject);) {
300300
SubMonitor subMonitor = SubMonitor.convert(monitor,
301-
// ManagedMakeMessages.getFormattedString(
302-
"AbstractBuiltinSpecsDetector.RunningScannerDiscovery", //$NON-NLS-1$
303-
// getName()),
304-
100);
301+
MessageFormat.format(
302+
Messages.RunningScannerDiscovery, getName()), 100);
305303

306304
IConsole console;
307305
if (isConsoleEnabled) {
@@ -331,11 +329,11 @@ private List<ICLanguageSettingEntry> runForLanguage(String currentLanguageId, St
331329

332330
buildRunnerHelper.prepareStreams(epm, parsers, console, subMonitor.split(TICKS_OUTPUT_PARSING));
333331

334-
buildRunnerHelper.greeting(// ManagedMakeMessages
335-
// .getFormattedString(
336-
"AbstractBuiltinSpecsDetector.RunningScannerDiscovery"//$NON-NLS-1$
337-
// , getName())
332+
buildRunnerHelper.greeting(MessageFormat.format(
333+
Messages.RunningScannerDiscovery , getName())
338334
);
335+
336+
System.out.println(currentCommandResolved);
339337
InternalBuildRunner.launchCommand(currentCommandResolved, autoConf,
340338
monitor, buildRunnerHelper);
341339

@@ -412,7 +410,7 @@ public void startup(ICConfigurationDescription cfgDescription, IWorkingDirectory
412410

413411
@Override
414412
public boolean processLine(String line) {
415-
// System.out.println(line);
413+
System.out.println(line);
416414

417415
for (Entry<Pattern, outputTypes> curMatcher : outputMatchers.entrySet()) {
418416
Pattern pat = curMatcher.getKey();

0 commit comments

Comments
 (0)