Author: slotia
Date: 2012-07-03 19:17:28 -0700 (Tue, 03 Jul 2012)
New Revision: 29753
Modified:
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/ConsoleDialog.java
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyActivator.java
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyStatusBar.java
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/UserMessagesDialog.java
Log:
Changed from total memory to max memory
Modified:
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/ConsoleDialog.java
===================================================================
---
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/ConsoleDialog.java
2012-07-04 01:08:20 UTC (rev 29752)
+++
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/ConsoleDialog.java
2012-07-04 02:17:28 UTC (rev 29753)
@@ -169,6 +169,7 @@
dialog = new JDialog(app.getJFrame(), "Developer's Log
Console");
dialog.setLayout(new GridBagLayout());
dialog.setModal(false);
+ dialog.setAlwaysOnTop(false);
filterTextField = new JTextField();
makeFilterTextFieldValid();
Modified:
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyActivator.java
2012-07-04 01:08:20 UTC (rev 29752)
+++
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyActivator.java
2012-07-04 02:17:28 UTC (rev 29753)
@@ -23,6 +23,9 @@
import static org.cytoscape.work.ServiceProperties.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class CyActivator extends AbstractCyActivator {
public CyActivator() {
super();
@@ -108,42 +111,6 @@
PREFERRED_MENU, "Help",
TITLE, "Developer's Log Console...")
);
- /*
-
- Map logViewConfigMap = new HashMap();
- logViewConfigMap.put("baseHTMLPath","/consoledialogbase.html");
- logViewConfigMap.put("colorParityTrue","ffffff");
- logViewConfigMap.put("colorParityFalse","eeeeee");
- logViewConfigMap.put("entryTemplate"," <html> <body
bgcolor=\"#%s\"> <table border=0 width=\"100%%\" cellspacing=5> <tr> <td
width=\"0%%\"><img src=\"%s\"></td> <td><h3>%s</h3></td> </tr> <tr> <td></td>
<td><font size=\"-2\" color=\"#555555\">%s</font></td> </tr> </table> </body>
</html>");
- logViewConfigMap.put("DEBUG","console-debug.png");
- logViewConfigMap.put("ERROR","console-error.png");
- logViewConfigMap.put("FATAL","console-error.png");
- logViewConfigMap.put("INFO","console-info.png");
- logViewConfigMap.put("TRACE","console-debug.png");
- logViewConfigMap.put("WARN","console-warning.png");
-
- Map statusBarConfigMap = new HashMap();
-
- LinkedBlockingQueue advancedQueue = new LinkedBlockingQueue();
- LinkedBlockingQueue statusBarQueue = new LinkedBlockingQueue();
- AdvancedQueueAppender advancedAppender = new
AdvancedQueueAppender(advancedQueue);
- StatusBarQueueAppender statusBarAppender = new
StatusBarQueueAppender(statusBarQueue);
- StatusBarUpdater statusBarUpdater = new
StatusBarUpdater(cytoStatusBar,statusBarQueue,statusBarConfigMap);
- ConsoleTaskFactory consoleTaskFactory = new
ConsoleTaskFactory(simpleQueue,advancedQueue,executorService,cytoStatusBar,cySwingApplicationRef,taskManagerRef,logViewConfigMap,logViewConfigMap);
-
-
- Properties advancedAppenderProps = new Properties();
-
advancedAppenderProps.setProperty("org.ops4j.pax.logging.appender.name","OrgCytoscapeLogSwingAdvancedAppender");
- registerService(bc,advancedAppender,PaxAppender.class,
advancedAppenderProps);
-
-
- Properties statusBarAppenderProps = new Properties();
-
statusBarAppenderProps.setProperty("org.ops4j.pax.logging.appender.name","OrgCytoscapeLogSwingStatusBarAppender");
- registerService(bc,statusBarAppender,PaxAppender.class,
statusBarAppenderProps);
-
- Properties consoleTaskFactoryProps = new Properties();
- registerService(bc,consoleTaskFactory,TaskFactory.class,
consoleTaskFactoryProps);
- */
}
}
Modified:
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyStatusBar.java
===================================================================
---
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyStatusBar.java
2012-07-04 01:08:20 UTC (rev 29752)
+++
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyStatusBar.java
2012-07-04 02:17:28 UTC (rev 29753)
@@ -9,7 +9,6 @@
import java.util.HashMap;
import org.cytoscape.application.swing.CySwingApplication;
-
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
@@ -17,6 +16,7 @@
* Handles the status bar at the bottom of the Cytoscape desktop
*/
class CyStatusBar extends JPanel {
+ static final Logger logger = LoggerFactory.getLogger("CyUserMessages");
static final int MEM_UPDATE_DELAY_MS = 2000;
static final int MEM_STATE_ICON_DIM_PX = 14;
static enum MemState {
@@ -40,6 +40,8 @@
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setColor(color);
g2d.fillOval(1, 1, MEM_STATE_ICON_DIM_PX - 2,
MEM_STATE_ICON_DIM_PX - 2);
+ g2d.setColor(Color.DARK_GRAY);
+ g2d.drawOval(1, 1, MEM_STATE_ICON_DIM_PX - 3,
MEM_STATE_ICON_DIM_PX - 3);
this.icon = new ImageIcon(image);
}
@@ -94,8 +96,10 @@
final Runtime runtime = Runtime.getRuntime();
final long freeMem = runtime.freeMemory();
final long totalMem = runtime.totalMemory();
- final double usedMem = 1.0 - (freeMem / (double) totalMem);
- return (float) usedMem;
+ final long usedMem = totalMem - freeMem;
+ final long maxMem = runtime.maxMemory();
+ final double usedMemFraction = usedMem / (double) maxMem;
+ return (float) usedMemFraction;
}
static void performGC() {
@@ -163,7 +167,7 @@
}
});
gcBtn.setVisible(false);
- gcBtn.setToolTipText("Invoke the Java Virtual Machine's garbage
collector to try to free unused memory.");
+ gcBtn.setToolTipText("<html>Try to free unused
memory.<br><br><i>Warning:</i> freeing memory may freeze Cytoscape for several
seconds.</html>");
setFontSize(gcBtn, 9);
memStatusBtn = new JToggleButton();
@@ -215,10 +219,8 @@
updateTimer.start();
}
- Logger logger = LoggerFactory.getLogger("CyUserMessages");
-
private void updateMemStatus() {
- final long memTotal = Runtime.getRuntime().totalMemory();
+ final long memTotal = Runtime.getRuntime().maxMemory();
final String memTotalFmt = MemUnit.format(memTotal);
final float memUsed = getMemUsed();
Modified:
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/UserMessagesDialog.java
===================================================================
---
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/UserMessagesDialog.java
2012-07-04 01:08:20 UTC (rev 29752)
+++
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/UserMessagesDialog.java
2012-07-04 02:17:28 UTC (rev 29753)
@@ -16,6 +16,7 @@
dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
dialog.setPreferredSize(new Dimension(850, 400));
dialog.setModal(false);
+ dialog.setAlwaysOnTop(false);
logViewer = new LogViewer(logViewerConfig);
dialog.add(logViewer.getComponent(), BorderLayout.CENTER);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
