Author: milamber
Date: Sat Mar 5 18:21:52 2016
New Revision: 1733750
URL: http://svn.apache.org/viewvc?rev=1733750&view=rev
Log:
Initialize the HiDPI mode and scale factor into JMeterUtils
Bugzilla Id: 58426
Modified:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java
jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
Sat Mar 5 18:21:52 2016
@@ -207,8 +207,8 @@ public class UserParametersGui extends A
// paramTable.setPreferredScrollableViewportSize(new Dimension(100,
// 70));
// HiDPI mode management
- if (HIDPI_MODE) {
- paramTable.setRowHeight((int) Math.round(paramTable.getRowHeight()
* HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ paramTable.setRowHeight((int) Math.round(paramTable.getRowHeight()
* JMeterUtils.getHiDPIScaleFactor()));
}
paramPanel = new JPanel(new BorderLayout());
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
Sat Mar 5 18:21:52 2016
@@ -161,8 +161,8 @@ public class PropertyControlGui extends
table.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
// HiDPI mode management
- if (HIDPI_MODE) {
- table.setRowHeight((int) Math.round(table.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ table.setRowHeight((int) Math.round(table.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
return makeScrollPane(table);
}
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
Sat Mar 5 18:21:52 2016
@@ -64,11 +64,6 @@ import org.apache.jorphan.reflect.Functo
*/
public abstract class SamplerResultTab implements ResultRenderer {
- // HiDPI mode
- private static final boolean HIDPI_MODE =
JMeterUtils.getPropDefault("jmeter.hidpi.mode", false); // $NON-NLS-1$
- // HiDPI mode
- private static final double HIDPI_SCALE_FACTOR =
Double.valueOf(JMeterUtils.getPropDefault("jmeter.hidpi.scale.factor", "1.0"));
// $NON-NLS-1$ $NON-NLS-2$
-
// N.B. these are not multi-threaded, so don't make it static
private final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd
HH:mm:ss z"); // ISO format $NON-NLS-1$
@@ -410,8 +405,8 @@ public abstract class SamplerResultTab i
// Set up the 1st table Result with empty headers
tableResult = new JTable(resultModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- tableResult.setRowHeight((int)
Math.round(tableResult.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ tableResult.setRowHeight((int)
Math.round(tableResult.getRowHeight() * JMeterUtils.getHiDPIScaleFactor()));
}
tableResult.setToolTipText(JMeterUtils.getResString("textbox_tooltip_cell"));
// $NON-NLS-1$
tableResult.addMouseListener(new TextBoxDoubleClick(tableResult));
@@ -421,8 +416,8 @@ public abstract class SamplerResultTab i
// Set up the 2nd table
tableResHeaders = new JTable(resHeadersModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- tableResHeaders.setRowHeight((int)
Math.round(tableResHeaders.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ tableResHeaders.setRowHeight((int)
Math.round(tableResHeaders.getRowHeight() * JMeterUtils.getHiDPIScaleFactor()));
}
tableResHeaders.setToolTipText(JMeterUtils.getResString("textbox_tooltip_cell"));
// $NON-NLS-1$
tableResHeaders.addMouseListener(new
TextBoxDoubleClick(tableResHeaders));
@@ -434,8 +429,8 @@ public abstract class SamplerResultTab i
// Set up the 3rd table
tableResFields = new JTable(resFieldsModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- tableResFields.setRowHeight((int)
Math.round(tableResFields.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ tableResFields.setRowHeight((int)
Math.round(tableResFields.getRowHeight() * JMeterUtils.getHiDPIScaleFactor()));
}
tableResFields.setToolTipText(JMeterUtils.getResString("textbox_tooltip_cell"));
// $NON-NLS-1$
tableResFields.addMouseListener(new
TextBoxDoubleClick(tableResFields));
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
Sat Mar 5 18:21:52 2016
@@ -414,8 +414,8 @@ public class StatGraphVisualizer extends
myJTable = new JTable(model);
// HiDPI mode management
- if (HIDPI_MODE) {
- myJTable.setRowHeight((int) Math.round(myJTable.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ myJTable.setRowHeight((int) Math.round(myJTable.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
// Fix centering of titles
myJTable.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer(COLUMNS_MSG_PARAMETERS));
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
Sat Mar 5 18:21:52 2016
@@ -174,8 +174,8 @@ public class StatVisualizer extends Abst
// new SortFilterModel(myStatTableModel);
myJTable = new JTable(model);
// HiDPI mode management
- if (HIDPI_MODE) {
- myJTable.setRowHeight((int) Math.round(myJTable.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ myJTable.setRowHeight((int) Math.round(myJTable.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
myJTable.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer(StatGraphVisualizer.COLUMNS_MSG_PARAMETERS));
myJTable.setPreferredScrollableViewportSize(new Dimension(500, 70));
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
Sat Mar 5 18:21:52 2016
@@ -235,8 +235,8 @@ public class SummaryReport extends Abstr
myJTable = new JTable(model);
// HiDPI mode management
- if (HIDPI_MODE) {
- myJTable.setRowHeight((int) Math.round(myJTable.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ myJTable.setRowHeight((int) Math.round(myJTable.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
myJTable.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
myJTable.setPreferredScrollableViewportSize(new Dimension(500, 70));
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
Sat Mar 5 18:21:52 2016
@@ -238,8 +238,8 @@ public class TableVisualizer extends Abs
// Set up the table itself
table = new JTable(model);
// HiDPI mode management
- if (HIDPI_MODE) {
- table.setRowHeight((int) Math.round(table.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ table.setRowHeight((int) Math.round(table.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
table.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
// table.getTableHeader().setReorderingAllowed(false);
Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java Sat
Mar 5 18:21:52 2016
@@ -63,11 +63,6 @@ public class ArgumentsPanel extends Abst
private static final long serialVersionUID = 240L;
- // HiDPI mode
- private static final boolean HIDPI_MODE =
JMeterUtils.getPropDefault("jmeter.hidpi.mode", false); // $NON-NLS-1$
- // HiDPI mode
- private static final double HIDPI_SCALE_FACTOR =
Double.valueOf(JMeterUtils.getPropDefault("jmeter.hidpi.scale.factor", "1.0"));
// $NON-NLS-1$ $NON-NLS-2$
-
/** The title label for this component. */
private JLabel tableLabel;
@@ -650,8 +645,8 @@ public class ArgumentsPanel extends Abst
table.setBackground(this.background);
}
// HiDPI mode management
- if (HIDPI_MODE) {
- table.setRowHeight((int) Math.round(table.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ table.setRowHeight((int) Math.round(table.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
return makeScrollPane(table);
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java Sat
Mar 5 18:21:52 2016
@@ -204,8 +204,8 @@ public class SimpleConfigGui extends Abs
table = new JTable(tableModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- table.setRowHeight((int) Math.round(table.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ table.setRowHeight((int) Math.round(table.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
table.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
Sat Mar 5 18:21:52 2016
@@ -59,11 +59,6 @@ public abstract class AbstractJMeterGuiC
/** Logging */
private static final Logger log = LoggingManager.getLoggerForClass();
-
- // HiDPI mode
- public static final boolean HIDPI_MODE =
JMeterUtils.getPropDefault("jmeter.hidpi.mode", false); // $NON-NLS-1$
- // HiDPI mode
- public static final double HIDPI_SCALE_FACTOR =
Double.valueOf(JMeterUtils.getPropDefault("jmeter.hidpi.scale.factor", "1.0"));
// $NON-NLS-1$ $NON-NLS-2$
/** Flag indicating whether or not this component is enabled. */
private boolean enabled = true;
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java Sat Mar
5 18:21:52 2016
@@ -47,11 +47,6 @@ public class FileListPanel extends JPane
private static final long serialVersionUID = 1L;
- // HiDPI mode
- private static final boolean HIDPI_MODE =
JMeterUtils.getPropDefault("jmeter.hidpi.mode", false); // $NON-NLS-1$
- // HiDPI mode
- private static final double HIDPI_SCALE_FACTOR =
Double.valueOf(JMeterUtils.getPropDefault("jmeter.hidpi.scale.factor", "1.0"));
// $NON-NLS-1$ $NON-NLS-2$
-
private JTable files = null;
private transient ObjectTableModel tableModel = null;
@@ -121,8 +116,8 @@ public class FileListPanel extends JPane
this.initializeTableModel();
files = new JTable(tableModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- files.setRowHeight((int) Math.round(files.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ files.setRowHeight((int) Math.round(files.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
files.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
files.revalidate();
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java Sat
Mar 5 18:21:52 2016
@@ -61,11 +61,6 @@ import org.apache.log.Logger;
public class TableEditor extends PropertyEditorSupport implements
FocusListener,TestBeanPropertyEditor,TableModelListener, ClearGui {
private static final Logger log = LoggingManager.getLoggerForClass();
- // HiDPI mode
- public static final boolean HIDPI_MODE =
JMeterUtils.getPropDefault("jmeter.hidpi.mode", false); // $NON-NLS-1$
- // HiDPI mode
- public static final double HIDPI_SCALE_FACTOR =
Double.valueOf(JMeterUtils.getPropDefault("jmeter.hidpi.scale.factor", "1.0"));
// $NON-NLS-1$ $NON-NLS-2$
-
/**
* attribute name for class name of a table row;
* value must be java.lang.String, or a class which supports set and
get/is methods for the property name.
@@ -221,8 +216,8 @@ public class TableEditor extends Propert
model.addTableModelListener(this);
table = new JTable(model);
// HiDPI mode management
- if (HIDPI_MODE) {
- table.setRowHeight((int) Math.round(table.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ table.setRowHeight((int) Math.round(table.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
table.addFocusListener(this);
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Sat Mar 5
18:21:52 2016
@@ -1357,4 +1357,20 @@ public class JMeterUtils implements Unit
// NOOP
}
}
+
+ /*
+ * HiDPI mode
+ */
+ public static boolean getHiDPIMode() {
+ return JMeterUtils.getPropDefault("jmeter.hidpi.mode", false); //
$NON-NLS-1$
+ }
+
+ /*
+ * HiDPI scale factor
+ */
+ public static double getHiDPIScaleFactor() {
+ return
Double.valueOf(JMeterUtils.getPropDefault("jmeter.hidpi.scale.factor", "1.0"));
// $NON-NLS-1$ $NON-NLS-2$
+
+ }
+
}
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
Sat Mar 5 18:21:52 2016
@@ -270,8 +270,8 @@ public class AuthPanel extends AbstractC
// create the JTable that holds auth per row
authTable = new JTable(tableModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- authTable.setRowHeight((int) Math.round(authTable.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ authTable.setRowHeight((int) Math.round(authTable.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
authTable.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
authTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
Sat Mar 5 18:21:52 2016
@@ -369,8 +369,8 @@ public class CookiePanel extends Abstrac
// create the JTable that holds one cookie per row
cookieTable = new JTable(tableModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- cookieTable.setRowHeight((int)
Math.round(cookieTable.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ cookieTable.setRowHeight((int)
Math.round(cookieTable.getRowHeight() * JMeterUtils.getHiDPIScaleFactor()));
}
cookieTable.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
cookieTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/DNSCachePanel.java
Sat Mar 5 18:21:52 2016
@@ -200,8 +200,8 @@ public class DNSCachePanel extends Abstr
// create the JTable that holds header per row
dnsServersTable = new JTable(dnsServersTableModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- dnsServersTable.setRowHeight((int)
Math.round(dnsServersTable.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ dnsServersTable.setRowHeight((int)
Math.round(dnsServersTable.getRowHeight() * JMeterUtils.getHiDPIScaleFactor()));
}
dnsServersTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
dnsServersTable.setPreferredScrollableViewportSize(new Dimension(400,
100));
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
Sat Mar 5 18:21:52 2016
@@ -61,11 +61,6 @@ public class HTTPFileArgsPanel extends J
private static final long serialVersionUID = 240L;
- // HiDPI mode
- private static final boolean HIDPI_MODE =
JMeterUtils.getPropDefault("jmeter.hidpi.mode", false); // $NON-NLS-1$
- // HiDPI mode
- private static final double HIDPI_SCALE_FACTOR =
Double.valueOf(JMeterUtils.getPropDefault("jmeter.hidpi.scale.factor", "1.0"));
// $NON-NLS-1$ $NON-NLS-2$
-
/** The title label for this component. */
@Deprecated
private JLabel tableLabel;
@@ -350,8 +345,8 @@ public class HTTPFileArgsPanel extends J
initializeTableModel();
table = new JTable(tableModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- table.setRowHeight((int) Math.round(table.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ table.setRowHeight((int) Math.round(table.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
table.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
Sat Mar 5 18:21:52 2016
@@ -280,8 +280,8 @@ public class HeaderPanel extends Abstrac
// create the JTable that holds header per row
headerTable = new JTable(tableModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- headerTable.setRowHeight((int)
Math.round(headerTable.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ headerTable.setRowHeight((int)
Math.round(headerTable.getRowHeight() * JMeterUtils.getHiDPIScaleFactor()));
}
headerTable.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
headerTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Sat Mar 5 18:21:52 2016
@@ -862,8 +862,8 @@ public class ProxyControlGui extends Log
includeModel = new PowerTableModel(new String[] { INCLUDE_COL }, new
Class[] { String.class });
includeTable = new JTable(includeModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- includeTable.setRowHeight((int)
Math.round(includeTable.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ includeTable.setRowHeight((int)
Math.round(includeTable.getRowHeight() * JMeterUtils.getHiDPIScaleFactor()));
}
includeTable.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
includeTable.setPreferredScrollableViewportSize(new Dimension(100,
30));
@@ -882,8 +882,8 @@ public class ProxyControlGui extends Log
excludeModel = new PowerTableModel(new String[] { EXCLUDE_COL }, new
Class[] { String.class });
excludeTable = new JTable(excludeModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- excludeTable.setRowHeight((int)
Math.round(excludeTable.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ excludeTable.setRowHeight((int)
Math.round(excludeTable.getRowHeight() * JMeterUtils.getHiDPIScaleFactor()));
}
excludeTable.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
excludeTable.setPreferredScrollableViewportSize(new Dimension(100,
30));
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
Sat Mar 5 18:21:52 2016
@@ -65,11 +65,6 @@ public class RequestViewHTTP implements
private static final Logger log = LoggingManager.getLoggerForClass();
- // HiDPI mode
- private static final boolean HIDPI_MODE =
JMeterUtils.getPropDefault("jmeter.hidpi.mode", false); // $NON-NLS-1$
- // HiDPI mode
- private static final double HIDPI_SCALE_FACTOR =
Double.valueOf(JMeterUtils.getPropDefault("jmeter.hidpi.scale.factor", "1.0"));
// $NON-NLS-1$ $NON-NLS-2$
-
private static final String KEY_LABEL =
"view_results_table_request_tab_http"; //$NON-NLS-1$
private static final String CHARSET_DECODE = "ISO-8859-1"; //$NON-NLS-1$
@@ -376,8 +371,8 @@ public class RequestViewHTTP implements
// Set up the 1st table Result with empty headers
tableRequest = new JTable(requestModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- tableRequest.setRowHeight((int)
Math.round(tableRequest.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ tableRequest.setRowHeight((int)
Math.round(tableRequest.getRowHeight() * JMeterUtils.getHiDPIScaleFactor()));
}
tableRequest.setToolTipText(JMeterUtils.getResString("textbox_tooltip_cell"));
// $NON-NLS-1$
tableRequest.addMouseListener(new TextBoxDoubleClick(tableRequest));
@@ -388,8 +383,8 @@ public class RequestViewHTTP implements
// Set up the 2nd table
tableParams = new JTable(paramsModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- tableParams.setRowHeight((int)
Math.round(tableParams.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ tableParams.setRowHeight((int)
Math.round(tableParams.getRowHeight() * JMeterUtils.getHiDPIScaleFactor()));
}
tableParams.setToolTipText(JMeterUtils.getResString("textbox_tooltip_cell"));
// $NON-NLS-1$
tableParams.addMouseListener(new TextBoxDoubleClick(tableParams));
@@ -401,8 +396,8 @@ public class RequestViewHTTP implements
// Set up the 3rd table
tableHeaders = new JTable(headersModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- tableHeaders.setRowHeight((int)
Math.round(tableHeaders.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ tableHeaders.setRowHeight((int)
Math.round(tableHeaders.getRowHeight() * JMeterUtils.getHiDPIScaleFactor()));
}
tableHeaders.setToolTipText(JMeterUtils.getResString("textbox_tooltip_cell"));
// $NON-NLS-1$
tableHeaders.addMouseListener(new TextBoxDoubleClick(tableHeaders));
Modified:
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
(original)
+++
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
Sat Mar 5 18:21:52 2016
@@ -54,11 +54,6 @@ public class JMSPropertiesPanel extends
private static final Logger log = LoggingManager.getLoggerForClass();
- // HiDPI mode
- private static final boolean HIDPI_MODE =
JMeterUtils.getPropDefault("jmeter.hidpi.mode", false); // $NON-NLS-1$
- // HiDPI mode
- private static final double HIDPI_SCALE_FACTOR =
Double.valueOf(JMeterUtils.getPropDefault("jmeter.hidpi.scale.factor", "1.0"));
// $NON-NLS-1$ $NON-NLS-2$
-
private static final String ADD_COMMAND = "Add"; //$NON-NLS-1$
private static final String DELETE_COMMAND = "Delete"; //$NON-NLS-1$
@@ -196,8 +191,8 @@ public class JMSPropertiesPanel extends
// create the JTable that holds JMSProperty per row
jmsPropertiesTable = new JTable(tableModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- jmsPropertiesTable.setRowHeight((int)
Math.round(jmsPropertiesTable.getRowHeight() * HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ jmsPropertiesTable.setRowHeight((int)
Math.round(jmsPropertiesTable.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
jmsPropertiesTable.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
jmsPropertiesTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
Modified:
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java?rev=1733750&r1=1733749&r2=1733750&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
(original)
+++
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
Sat Mar 5 18:21:52 2016
@@ -291,8 +291,8 @@ public class LDAPArgumentsPanel extends
initializeTableModel();
table = new JTable(tableModel);
// HiDPI mode management
- if (HIDPI_MODE) {
- table.setRowHeight((int) Math.round(table.getRowHeight() *
HIDPI_SCALE_FACTOR));
+ if (JMeterUtils.getHiDPIMode()) {
+ table.setRowHeight((int) Math.round(table.getRowHeight() *
JMeterUtils.getHiDPIScaleFactor()));
}
table.getTableHeader().setDefaultRenderer(new
HeaderAsPropertyRenderer());
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
