MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

a better NPE fix, some space around the log icon

Browse Source
This commit is contained in:
peter
2011-06-01 13:57:36 +02:00
parent 82ed80cffa
commit f5ee63099b
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
+2 -3
View File
@@ -364,9 +364,8 @@ public class InfoAndProgressPanel extends JPanel implements CustomStatusBarWidge
return Pair.create(myInfoPanel.getText(), myCurrentRequestor);
}
final boolean logMode = StringUtil.isEmpty(text) && !hasProgressIndicators();
myInfoPanel.updateText(logMode, text);
myCurrentRequestor = logMode ? requestor : null;
boolean logMode = myInfoPanel.updateText(!hasProgressIndicators(), text);
myCurrentRequestor = logMode ? null : requestor;
return Pair.create(text, requestor);
}
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusPanel.java
+11 -6
View File
@@ -16,6 +16,7 @@
package com.intellij.openapi.wm.impl.status;
import com.intellij.notification.impl.NotificationsManagerImpl;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.util.IconLoader;
@@ -38,6 +39,7 @@ import java.util.Date;
* @author peter
*/
class StatusPanel extends JPanel {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.impl.status.StatusPanel");
private static final Icon ourShowLogIcon = IconLoader.getIcon("/general/hideSideUp.png");
private static final Icon ourHideLogIcon = IconLoader.getIcon("/general/hideSideDown.png");
private boolean myLogMode;
@@ -53,6 +55,8 @@ class StatusPanel extends JPanel {
setOpaque(isOpaque() && !SystemInfo.isMac);
myShowLog.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
myShowLog.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
@@ -89,17 +93,18 @@ class StatusPanel extends JPanel {
myDirty = false;
}
public void updateText(boolean logMode, @Nullable String nonLogText) {
myLogMode = logMode;
public boolean updateText(boolean logAllowed, @Nullable String nonLogText) {
myLogMode = logAllowed && StringUtil.isEmpty(nonLogText) && myLogMessage != null;
myShowLog.setVisible(logMode);
myShowLog.setVisible(myLogMode);
if (logMode) {
if (myLogMode) {
LOG.assertTrue(myLogTime != null);
new Runnable() {
@Override
public void run() {
String text = myLogMessage;
if (myLogTime != null && (myDirty || System.currentTimeMillis() - myLogTime.getTime() >= DateFormatUtil.MINUTE)) {
if (myDirty || System.currentTimeMillis() - myLogTime.getTime() >= DateFormatUtil.MINUTE) {
text += " (" + StringUtil.decapitalize(DateFormatUtil.formatPrettyDateTime(myLogTime)) + ")";
}
myTextPanel.setText(text);
@@ -127,7 +132,7 @@ class StatusPanel extends JPanel {
myTextPanel.setText(nonLogText);
myLogAlarm.cancelAllRequests();
}
return myLogMode;
}
public void hideLog() {