Skip to content

Commit 76c2999

Browse files
authored
Merge pull request #86 from eharris369/85-removeLocationFromConsoleName
Issue #85: Remove location from the console name for log files
2 parents b6f68bf + 48d0f6e commit 76c2999

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/console/MicroclimateConsoleFactory.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@ public static IOConsole createBuildConsole(MicroclimateApplication app) {
4949

5050
public static SocketConsole createLogFileConsole(MicroclimateApplication app, ProjectLogInfo logInfo) {
5151
String consoleName;
52-
if (logInfo.workspaceLogPath != null && !logInfo.workspaceLogPath.isEmpty()) {
53-
IPath fullPath = MCUtil.appendPathWithoutDupe(app.mcConnection.getWorkspacePath(), logInfo.workspaceLogPath).append(logInfo.logName);
54-
consoleName = NLS.bind(Messages.LogFileConsoleNameWithLocation, new String[] {app.name, logInfo.logName, fullPath.toOSString()});
55-
} else {
56-
consoleName = NLS.bind(Messages.LogFileConsoleName, app.name, logInfo.logName);
57-
}
52+
consoleName = NLS.bind(Messages.LogFileConsoleName, app.name, logInfo.logName);
5853
SocketConsole console = new SocketConsole(consoleName, logInfo, app);
5954
onNewConsole(console);
6055
return console;

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/messages/Messages.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public class Messages extends NLS {
3838
public static String BuildConsoleName;
3939
public static String AppConsoleName;
4040
public static String LogFileConsoleName;
41-
public static String LogFileConsoleNameWithLocation;
4241
public static String LogFileInitialMsg;
4342

4443
public static String FileNotFoundTitle;

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/messages/messages.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ MicroclimateServerBehaviour_DebuggerConnectFailureDialogMsg=The debugger failed
3131
BuildConsoleName={0} - Build Log
3232
AppConsoleName={0} - Application Log
3333
LogFileConsoleName={0} - {1}
34-
LogFileConsoleNameWithLocation={0} - {1} ({2})
3534
LogFileInitialMsg=Waiting for server to send logs...
3635

3736
FileNotFoundTitle=File not found

0 commit comments

Comments
 (0)