Improve workspace lock error dialog. #2347
Conversation
|
@iloveeclipse FYI |
|
Can you pls. provide a screenshot showing the new dialog? |
|
By the way if on the lock dialog is worked, it would be great to have a cancel button! Currently one can only |
Dialog looks like this with this fix. |
Write workspace lock info like user, host, java process id, display properties onto .lock file if the lock was successful. Read the current lock data in case of lock was unsuccessful and shown it in error dialog. If the .lock file has no info then nothing is shown. For older eclipse versions. see eclipse-platform#2343
raghucssit
force-pushed
the
impr_ws_lock_dlg_2343
branch
from
10fa592
to
f34d747
Compare
Test Results 1 815 files ±0 1 815 suites ±0 1h 34m 54s ⏱️ + 1m 12s For more details on these failures and errors, see this check. Results for commit f34d747. ± Comparison against base commit c9b34e4. |
Maybe User, Host, etc. should be written in with an uppercase first letter (because they are some kind of label) |
|
And these display strings must be localizeable. |
| private String getHostName() { | ||
| String hostName = null; | ||
| try { | ||
| hostName = InetAddress.getLocalHost().getHostName(); |
There was a problem hiding this comment.
I would prefer to check environment variable HOSTNAME first, because it doesn't do any network lookups and so is cheap on Linux.
| props.load(is); | ||
| String prop = props.getProperty(USER); | ||
| if (prop != null) { | ||
| sb.append("user: ").append(prop).append(System.lineSeparator()); //$NON-NLS-1$ |
There was a problem hiding this comment.
Could you please use IDEWorkbenchMessages so the strings could be translated if needed.
| return null; | ||
| } | ||
|
|
||
| String displayText = "Workspace lock is held by the following owner:\n".concat(lockInfo); //$NON-NLS-1$ |
There was a problem hiding this comment.
Please use IDEWorkbenchMessages here
| * | ||
| * @return Previous lock owner details. | ||
| */ | ||
| private String getWorkspaceLockInfo(URL workspaceUrl) { |
There was a problem hiding this comment.
Could you please make this method and writeWsLockInfo() protected? This is not API, but we override parts of the class internally and these two methods most likely could need some customization sooner or later.
|
|
||
| // make sure the directory exists | ||
| File metaDir = new File(workspaceUrl.getPath(), METADATA_FOLDER); | ||
| if (!metaDir.exists()) { |
There was a problem hiding this comment.
No need for extra folder check, file check below will do the job too
| * @return Previous lock owner details. | ||
| */ | ||
| private String getWorkspaceLockInfo(URL workspaceUrl) { | ||
| File lockFile = getLockFile(workspaceUrl); |
| * display and current java process id. | ||
| */ | ||
| private void writeWsLockInfo() { | ||
| Location instanceLoc = Platform.getInstanceLocation(); |
There was a problem hiding this comment.
Please first create properties & fill with the data, and only if the properties are not empty, open file for writing.
| String hostName = null; | ||
| try { | ||
| hostName = InetAddress.getLocalHost().getHostName(); | ||
| } catch (UnknownHostException e) { |
There was a problem hiding this comment.
to be consistent, I would also catch here generic Exception, just in case.
Write workspace lock info like user, host, java process id, display properties onto .lock file if the lock was successful. Read the current lock data in case of lock was unsuccessful and shown it in error dialog.
If the .lock file has no info then nothing is shown. For older eclipse versions.
see #2343