diff --git a/plugins/consumervisualvm/src/org/netbeans/modules/consumervisualvm/engine/Bundle.properties b/plugins/consumervisualvm/src/org/netbeans/modules/consumervisualvm/engine/Bundle.properties index 8fdc7f60ec..099c36d6c4 100644 --- a/plugins/consumervisualvm/src/org/netbeans/modules/consumervisualvm/engine/Bundle.properties +++ b/plugins/consumervisualvm/src/org/netbeans/modules/consumervisualvm/engine/Bundle.properties @@ -40,11 +40,11 @@ InstallerMissingModules_Download=Downloading {0} ModulesActivator_Enable=Activating {0} -InstallerMissingModules_Verify=Verifing... +InstallerMissingModules_Verify=Verifying... InstallerMissingModules_Install=Installing... InstallerMissingModules_TryAgainButton=&Try Again InstallerMissingModules_ErrorPanel_Title=Error InstallerMissingModules_ErrorPanel=Installation cannot be completed due to {0} \n {1} -InstallerMissingModules_NeedsRestart=Restart IDE to complete instaling asked plugins. -FindComponentModules_Problem_PluginNotFound=The plugin {0} is not avialable in this moment. -FindComponentModules_Problem_DependingPluginNotFound=The plugin {0} cannot satisfy all its dependencies {1}. Maybe some required plugins are not avialable in this moment. +InstallerMissingModules_NeedsRestart=Restart IDE to complete installing asked plugins. +FindComponentModules_Problem_PluginNotFound=The plugin {0} is not available in this moment. +FindComponentModules_Problem_DependingPluginNotFound=The plugin {0} cannot satisfy all its dependencies {1}. Maybe some required plugins are not available in this moment. diff --git a/plugins/extapptypes.lib/src/org/graalvm/visualvm/modules/customtype/lib/Bundle.properties b/plugins/extapptypes.lib/src/org/graalvm/visualvm/modules/customtype/lib/Bundle.properties index 9fe314260c..f1afac6725 100644 --- a/plugins/extapptypes.lib/src/org/graalvm/visualvm/modules/customtype/lib/Bundle.properties +++ b/plugins/extapptypes.lib/src/org/graalvm/visualvm/modules/customtype/lib/Bundle.properties @@ -1,6 +1,6 @@ OpenIDE-Module-Display-Category=Infrastructure OpenIDE-Module-Long-Description=\ - This is a growing collection of application types for the most popular Java applicaitons.\n\n\ + This is a growing collection of application types for the most popular Java applications.\n\n\ It contains application types for applications such as jEdit, PMD, FindBugs, aTunes etc. OpenIDE-Module-Name=Custom Application Types - Collection OpenIDE-Module-Short-Description=Application types for widely used Java applications diff --git a/plugins/extapptypes.lib/src/org/graalvm/visualvm/modules/customtype/lib/layer.xml b/plugins/extapptypes.lib/src/org/graalvm/visualvm/modules/customtype/lib/layer.xml index f67497b786..fecbe80782 100644 --- a/plugins/extapptypes.lib/src/org/graalvm/visualvm/modules/customtype/lib/layer.xml +++ b/plugins/extapptypes.lib/src/org/graalvm/visualvm/modules/customtype/lib/layer.xml @@ -111,7 +111,7 @@ + It can open GuitarPro, PowerTab and TableEdit files."/> diff --git a/plugins/extensions/src/org/graalvm/visualvm/modules/extensions/DiabloJvmJvmstatModelProvider.java b/plugins/extensions/src/org/graalvm/visualvm/modules/extensions/DiabloJvmJvmstatModelProvider.java index 25f43c3f90..0bc435f080 100644 --- a/plugins/extensions/src/org/graalvm/visualvm/modules/extensions/DiabloJvmJvmstatModelProvider.java +++ b/plugins/extensions/src/org/graalvm/visualvm/modules/extensions/DiabloJvmJvmstatModelProvider.java @@ -33,7 +33,7 @@ /** * Detects Diablo JVM 1.5 (FreeBSD) - * Note that Diablo JVM 1.6 is detected by default VisualVM implemntation + * Note that Diablo JVM 1.6 is detected by default VisualVM implementation * * @author Tomas Hurka */ diff --git a/plugins/glassfish/src/net/java/visualvm/modules/glassfish/Bundle.properties b/plugins/glassfish/src/net/java/visualvm/modules/glassfish/Bundle.properties index 9216232180..40b2326644 100644 --- a/plugins/glassfish/src/net/java/visualvm/modules/glassfish/Bundle.properties +++ b/plugins/glassfish/src/net/java/visualvm/modules/glassfish/Bundle.properties @@ -27,7 +27,7 @@ OpenIDE-Module-Long-Description=\ A sample plugin giving an overview of advanced monitoring capabilities of VisualVM. \n\ Enhances monitoring of GlassFish application server by adding specialized overview, new tab for monitoring HTTP Service and the ability to visually select and monitor any of the deployed web applications OpenIDE-Module-Name=VisualVM-Glassfish -OpenIDE-Module-Short-Description=Enhaned monitoring of GlassFish application server +OpenIDE-Module-Short-Description=Enhanced monitoring of GlassFish application server ManagementTabContent.jLabel1.text=jLabel1 ManagementTabContent.jLabel2.text=jLabel2 diff --git a/plugins/glassfish/src/net/java/visualvm/modules/glassfish/dataview/Bundle.properties b/plugins/glassfish/src/net/java/visualvm/modules/glassfish/dataview/Bundle.properties index f90930fa35..edee634f44 100644 --- a/plugins/glassfish/src/net/java/visualvm/modules/glassfish/dataview/Bundle.properties +++ b/plugins/glassfish/src/net/java/visualvm/modules/glassfish/dataview/Bundle.properties @@ -2,13 +2,13 @@ WebModuleViewPanel.jPanel1.border.title=Sessions WebModuleViewPanel.labelCurrent.text=Active Current WebModuleViewPanel.labelMax.text=Active Max -WebModuleViewPanel.labelPassivated.text=Passivated +WebModuleViewPanel.labelZ_ThisIsNotAWordAndWasNotUsedWhenItWasOpenInitiallyReleased.text=Z_ThisIsNotAWordAndWasNotUsedWhenItWasOpenInitiallyReleased WebModuleViewPanel.labelCreated.text=Created WebModuleViewPanel.labelExpired.text=Expired WebModuleViewPanel.labelRejected.text=Rejected WebModuleViewPanel.valueCurrent.text=0 WebModuleViewPanel.valueMax.text=0 -WebModuleViewPanel.valuePassivated.text=0 +WebModuleViewPanel.valueZ_ThisIsNotAWordAndWasNotUsedWhenItWasOpenInitiallyReleased.text=0 WebModuleViewPanel.valueCreated.text=0 WebModuleViewPanel.valueExpired.text=0 WebModuleViewPanel.valueRejected.text=0 diff --git a/plugins/glassfish/src/net/java/visualvm/modules/glassfish/ui/Bundle.properties b/plugins/glassfish/src/net/java/visualvm/modules/glassfish/ui/Bundle.properties index 5eb1b104ef..ef063a7804 100644 --- a/plugins/glassfish/src/net/java/visualvm/modules/glassfish/ui/Bundle.properties +++ b/plugins/glassfish/src/net/java/visualvm/modules/glassfish/ui/Bundle.properties @@ -1,6 +1,6 @@ Tester.jToggleButton1.text=M ConnectionQueuePanel.labelUtilization.text=Connections: -ConnectionQueuePanel.lableRefusalRate.text=Refusal Rate [%]: +ConnectionQueuePanel.labelRefusalRate.text=Refusal Rate [%]: HttpListenerPanel.labelThreads.text=Threads: HttpListenerPanel.labelListeners.text=Listener: FileCachePanel.labelHitRatio.text=Hit Ratio: diff --git a/plugins/glassfish/src/net/java/visualvm/modules/glassfish/ui/Tachometer.java b/plugins/glassfish/src/net/java/visualvm/modules/glassfish/ui/Tachometer.java index 3acd2cbfc3..d6a2438317 100644 --- a/plugins/glassfish/src/net/java/visualvm/modules/glassfish/ui/Tachometer.java +++ b/plugins/glassfish/src/net/java/visualvm/modules/glassfish/ui/Tachometer.java @@ -84,8 +84,8 @@ public void paint(Graphics g) { // gv. // } // gr.drawGlyphVector(gv, insets.left + 2, getBounds().height - (insets.top + insets.bottom) - 2 - bounds.height); - int lineLenght = diameter / 2 - 10; - gr.drawLine(diameter / 2, diameter / 2, diameter / 2 - getXOnArc(lineLenght, getAngle()), diameter / 2 - getYOnArc(lineLenght, getAngle())); + int lineLength = diameter / 2 - 10; + gr.drawLine(diameter / 2, diameter / 2, diameter / 2 - getXOnArc(lineLength, getAngle()), diameter / 2 - getYOnArc(lineLength, getAngle())); gr.dispose(); g.drawImage(img, insets.left, insets.top, this); diff --git a/plugins/jconsole/src/org/graalvm/visualvm/modules/jconsole/options/JConsoleCustomizer.java b/plugins/jconsole/src/org/graalvm/visualvm/modules/jconsole/options/JConsoleCustomizer.java index b0a509f953..d4b49404df 100644 --- a/plugins/jconsole/src/org/graalvm/visualvm/modules/jconsole/options/JConsoleCustomizer.java +++ b/plugins/jconsole/src/org/graalvm/visualvm/modules/jconsole/options/JConsoleCustomizer.java @@ -59,11 +59,11 @@ public class JConsoleCustomizer extends JPanel { private boolean initialized; private PathController pluginsController; private JFileChooser pluginsChooser; - private JConsoleOptionsPanelController controler; + private JConsoleOptionsPanelController controller; JConsoleCustomizer(JConsoleOptionsPanelController contr) { - this.controler = contr; + this.controller = contr; initComponents(); pluginsChooser = new JFileChooser(); @@ -86,7 +86,7 @@ public void intervalRemoved(ListDataEvent arg0) {} } synchronized void changed() { - controler.changed(); + controller.changed(); } synchronized void load() { diff --git a/plugins/jsyntaxpane-lib/external/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane.config.properties b/plugins/jsyntaxpane-lib/external/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane.config.properties index 96bd811095..b74e053c6b 100644 --- a/plugins/jsyntaxpane-lib/external/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane.config.properties +++ b/plugins/jsyntaxpane-lib/external/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane.config.properties @@ -76,15 +76,15 @@ JavaSyntaxKit.SingleColorSelect = true # will be displayed JavaSyntaxKit.RightMarginColumn = 80 JavaSyntaxKit.RightMarginColor = 0xdddddd -JavaSyntaxKit.Action.PARENTHISIS = jsyntaxpane.actions.PairAction, typed ( +JavaSyntaxKit.Action.PARENTHESIS = jsyntaxpane.actions.PairAction, typed ( JavaSyntaxKit.Action.BRACKETS = jsyntaxpane.actions.PairAction, typed [ JavaSyntaxKit.Action.QUOTE = jsyntaxpane.actions.PairAction, typed ' JavaSyntaxKit.Action.DBL_QUOTE = jsyntaxpane.actions.PairAction, typed " JavaSyntaxKit.Action.CLOSE_CURLY = jsyntaxpane.actions.JUnindentAction, typed } JavaSyntaxKit.Action.TOGGLE_COMMENTS = jsyntaxpane.actions.ToggleCommentsAction, control SLASH # For completions, you have to define the Action (key to trigger completions): -# JavaSyntaxKit.Action.COMPELTION = jsyntaxpane.actions.MapCompletionAction, control SPACE -JavaSyntaxKit.Action.COMBO_COMPELTION = jsyntaxpane.actions.ComboCompletionAction, control SPACE +# JavaSyntaxKit.Action.COMPLETION = jsyntaxpane.actions.MapCompletionAction, control SPACE +JavaSyntaxKit.Action.COMBO_COMPLETION = jsyntaxpane.actions.ComboCompletionAction, control SPACE # and then the specified completions map in the below file JavaSyntaxKit.Completions.File = jsyntaxpane.javasyntaxkit.completions # @@ -92,7 +92,7 @@ JavaSyntaxKit.Completions.File = jsyntaxpane.javasyntaxkit.completions # comma separated values. # Vertical bars: if there is one, it will position the cursor. If there are # two, they will be start and end of selection -JavaSyntaxKit.COMBO_COMPELTION.Items = public, protected, private, class, static, \ +JavaSyntaxKit.COMBO_COMPLETION.Items = public, protected, private, class, static, \ .toString(), .equals(|), .hashCode(), \ JTextField, JEditorPane, JTextPane, JComboBox, JList, JTree, \ jsyntaxpane, .setContentType("text/|lang|"), .setProperty("|key|") diff --git a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/MBeansTab.java b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/MBeansTab.java index d10f2dbbe2..9f92889981 100644 --- a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/MBeansTab.java +++ b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/MBeansTab.java @@ -287,7 +287,7 @@ public void treeWillExpand(TreeExpansionEvent e) // DefaultMutableTreeNode node = // (DefaultMutableTreeNode) path.getLastPathComponent(); // // TODO: build branch for given domain - queryNames("d:*", null); -// // - if not already expanded, create from scracth +// // - if not already expanded, create from scratch // // - if already expanded, update // } } diff --git a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/Plotter.java b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/Plotter.java index 3ad7f6d434..45c428583c 100644 --- a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/Plotter.java +++ b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/Plotter.java @@ -224,7 +224,7 @@ public int getViewRange() { } /** - * @param minutes the displayed time range in minutes, or -1 to diaplay all data + * @param minutes the displayed time range in minutes, or -1 to display all data */ public void setViewRange(int minutes) { if (minutes != viewRange) { diff --git a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/TableSorter.java b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/TableSorter.java index b3d6826666..cdb3b2a1d3 100644 --- a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/TableSorter.java +++ b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/TableSorter.java @@ -92,7 +92,7 @@ private void restoreListeners() { @SuppressWarnings("unchecked") private int compare(Object o1, Object o2) { // take care of the case where both o1 & o2 are null. Needed to keep - // the method symetric. Without this quickSort gives surprising results. + // the method symmetric. Without this quickSort gives surprising results. if (o1 == o2) return 0; if (o1==null) @@ -124,7 +124,7 @@ private void sort(int column, boolean isAscending) { // // When we reach here the previous value is already validated, and the // old editor is closed, but the new editor might have opened. - // It's this new editor that wil be cancelled here, if needed. + // It's this new editor that will be cancelled here, if needed. // if (attrs != null && attrs.isEditing()) attrs.cancelCellEditing(); diff --git a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XMBeanAttributes.java b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XMBeanAttributes.java index 0bb034ce04..a5e64718d0 100644 --- a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XMBeanAttributes.java +++ b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XMBeanAttributes.java @@ -694,7 +694,7 @@ private ZoomedCell getZoomedCell(XMBean mbean, String attribute, Object value) { } } - //will be called in a synchronzed block + //will be called in a synchronized block protected void addTableData(DefaultTableModel tableModel, XMBean mbean, MBeanAttributeInfo[] attributesInfo, diff --git a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XMBeanNotifications.java b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XMBeanNotifications.java index 84266b0812..46bf71d55c 100644 --- a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XMBeanNotifications.java +++ b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XMBeanNotifications.java @@ -72,7 +72,7 @@ class XMBeanNotifications extends JTable implements NotificationListener { private int rowMinHeight = -1; private TableCellEditor userDataEditor = new UserDataCellEditor(); private NotifMouseListener mouseListener = new NotifMouseListener(); - private SimpleDateFormat timeFormater = new SimpleDateFormat("HH:mm:ss:SSS"); // NOI18N + private SimpleDateFormat timeFormatter = new SimpleDateFormat("HH:mm:ss:SSS"); // NOI18N private static TableCellEditor editor = new Utils.ReadOnlyTableCellEditor(new JTextField()); @@ -626,7 +626,7 @@ public void run() { try { if (unregistered) return; Date receivedDate = new Date(n.getTimeStamp()); - String time = timeFormater.format(receivedDate); + String time = timeFormatter.format(receivedDate); Object userData = n.getUserData(); Component comp = null; diff --git a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XTextField.java b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XTextField.java index 534e9a25fb..3ca93a2674 100644 --- a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XTextField.java +++ b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XTextField.java @@ -221,19 +221,19 @@ public Object getValue() { public void changedUpdate(DocumentEvent e) { // the user typed something, so remove references - // to the obejct that was dropped. + // to the object that was dropped. clearObject(); } public void removeUpdate(DocumentEvent e) { // the user typed something, so remove references - // to the obejct that was dropped. + // to the object that was dropped. clearObject(); } public void insertUpdate(DocumentEvent e) { // the user typed something, so remove references - // to the obejct that was dropped. + // to the object that was dropped. clearObject(); } diff --git a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XTextFieldEditor.java b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XTextFieldEditor.java index 5d33b3e692..82587ebc11 100644 --- a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XTextFieldEditor.java +++ b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/XTextFieldEditor.java @@ -51,7 +51,7 @@ public XTextFieldEditor() { textField.addFocusListener(editorFocusListener); } - //edition stopped ou JMenuItem selection & JTextField selection + //edition stopped on JMenuItem selection & JTextField selection @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); diff --git a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/options/GlobalPreferences.java b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/options/GlobalPreferences.java index 84888c18fc..aa91ba59b3 100644 --- a/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/options/GlobalPreferences.java +++ b/plugins/mbeans/src/org/graalvm/visualvm/modules/mbeans/options/GlobalPreferences.java @@ -146,12 +146,12 @@ private void addListener(String property, PreferenceChangeListener pcl) { } } - private int getPollingInterval(String property, int deflt) { + private int getPollingInterval(String property, int default_) { int value = -1; synchronized (prefs) { value = prefs.getInt(property, -1); if (value == -1) { - value = deflt; + value = default_; prefs.putInt(property, value); } } diff --git a/plugins/oqlsyntax/src/META-INF/services/jsyntaxpane.config.properties b/plugins/oqlsyntax/src/META-INF/services/jsyntaxpane.config.properties index 0430f623a2..cfa97bdf23 100644 --- a/plugins/oqlsyntax/src/META-INF/services/jsyntaxpane.config.properties +++ b/plugins/oqlsyntax/src/META-INF/services/jsyntaxpane.config.properties @@ -14,15 +14,15 @@ OqlSyntaxKit.SingleColorSelect = true # will be displayed OqlSyntaxKit.RightMarginColumn = 80 OqlSyntaxKit.RightMarginColor = 0xdddddd -OqlSyntaxKit.Action.PARENTHISIS = jsyntaxpane.actions.PairAction, typed ( +OqlSyntaxKit.Action.PARENTHESIS = jsyntaxpane.actions.PairAction, typed ( OqlSyntaxKit.Action.BRACKETS = jsyntaxpane.actions.PairAction, typed [ OqlSyntaxKit.Action.QUOTE = jsyntaxpane.actions.PairAction, typed ' OqlSyntaxKit.Action.DBL_QUOTE = jsyntaxpane.actions.PairAction, typed " OqlSyntaxKit.Action.CLOSE_CURLY = jsyntaxpane.actions.JUnindentAction, typed } OqlSyntaxKit.Action.TOGGLE_COMMENTS = jsyntaxpane.actions.ToggleCommentsAction, control SLASH # For completions, you have to define the Action (key to trigger completions): -# JavaSyntaxKit.Action.COMPELTION = jsyntaxpane.actions.MapCompletionAction, control SPACE -OqlSyntaxKit.Action.COMBO_COMPELTION = jsyntaxpane.actions.ComboCompletionAction, control SPACE +# JavaSyntaxKit.Action.COMPLETION = jsyntaxpane.actions.MapCompletionAction, control SPACE +OqlSyntaxKit.Action.COMBO_COMPLETION = jsyntaxpane.actions.ComboCompletionAction, control SPACE # and then the specified completions map in the below file OqlSyntaxKit.Completions.File = jsyntaxpane.oqlsyntaxkit.completions # @@ -30,7 +30,7 @@ OqlSyntaxKit.Completions.File = jsyntaxpane.oqlsyntaxkit.completions # comma separated values. # Vertical bars: if there is one, it will position the cursor. If there are # two, they will be start and end of selection -OqlSyntaxKit.COMBO_COMPELTION.Items = select, from, instanceof, where, \ +OqlSyntaxKit.COMBO_COMPLETION.Items = select, from, instanceof, where, \ heap., objectid(|), unique("|key|"), \ .forEachObject(|), .forEachClass("|callback|"), .findClass("|className|"), \ .findObject("|objectid|"), .classes(), .objects("|className|"), \ diff --git a/plugins/oqlsyntax/src/org/graalvm/visualvm/modules/oqlsyntax/Bundle.properties b/plugins/oqlsyntax/src/org/graalvm/visualvm/modules/oqlsyntax/Bundle.properties index 93d08b894a..1672fdade8 100644 --- a/plugins/oqlsyntax/src/org/graalvm/visualvm/modules/oqlsyntax/Bundle.properties +++ b/plugins/oqlsyntax/src/org/graalvm/visualvm/modules/oqlsyntax/Bundle.properties @@ -1,5 +1,5 @@ OpenIDE-Module-Display-Category=UI OpenIDE-Module-Long-Description=\ - Provides syntax highlighting, brace matching, intendation and simple code completion + Provides syntax highlighting, brace matching, indentation and simple code completion OpenIDE-Module-Name=OQL Syntax Support OpenIDE-Module-Short-Description=Enhanced UI for OQL query editor diff --git a/plugins/oqlsyntax/src/org/graalvm/visualvm/modules/oqlsyntax/OqlLexer.java b/plugins/oqlsyntax/src/org/graalvm/visualvm/modules/oqlsyntax/OqlLexer.java index 11d980e56e..8a6258d414 100644 --- a/plugins/oqlsyntax/src/org/graalvm/visualvm/modules/oqlsyntax/OqlLexer.java +++ b/plugins/oqlsyntax/src/org/graalvm/visualvm/modules/oqlsyntax/OqlLexer.java @@ -266,7 +266,7 @@ private static int zzUnpackTrans(String packed, int offset, int [] result) { /* error messages for the codes above */ private static final String ZZ_ERROR_MSG[] = { - "Unkown internal scanner error", + "Unknown internal scanner error", "Error: could not match input", "Error: pushback value was too large" }; @@ -379,7 +379,7 @@ public OqlLexer(java.io.Reader in) { * Creates a new scanner. * There is also java.io.Reader version of this constructor. * - * @param in the java.io.Inputstream to read input from. + * @param in the java.io.InputStream to read input from. */ public OqlLexer(java.io.InputStream in) { this(new java.io.InputStreamReader(in)); @@ -533,7 +533,7 @@ public final int yylength() { /** - * Reports an error that occured while scanning. + * Reports an error that occurred while scanning. * * In a wellformed scanner (no or only correct usage of * yypushback(int) and a match-all fallback rule) this method diff --git a/plugins/sources/src/org/graalvm/visualvm/sources/options/SourcesOptionsPanel.java b/plugins/sources/src/org/graalvm/visualvm/sources/options/SourcesOptionsPanel.java index f7571c3078..ed7219ef9d 100644 --- a/plugins/sources/src/org/graalvm/visualvm/sources/options/SourcesOptionsPanel.java +++ b/plugins/sources/src/org/graalvm/visualvm/sources/options/SourcesOptionsPanel.java @@ -710,7 +710,7 @@ public void propertyChange(PropertyChangeEvent evt) { final File[] subdirs = (File[])evt.getNewValue(); - if (processor == null) processor = new RequestProcessor("Source Roots Subfoldes Processor"); // NOI18N + if (processor == null) processor = new RequestProcessor("Source Roots Subfolders Processor"); // NOI18N processor.post(new Runnable() { public void run() { diff --git a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/PackageStateHandler.java b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/PackageStateHandler.java index 984c090503..1d817665f3 100644 --- a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/PackageStateHandler.java +++ b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/PackageStateHandler.java @@ -58,11 +58,11 @@ public interface PackageStateHandler { * Package to notify the user about initialization progress. The actual * initialization (and updating the TracerProgressObject) should be * performed in the sessionStarting() method. Useful for example for - * messaging a delay during instrumention of classes in target application. + * messaging a delay during instrumentation of classes in target application. * * @param probes probes defined for the Tracer session * @param dataSource monitored DataSource - * @param refresh session refresh rate in miliseconds + * @param refresh session refresh rate in milliseconds * @return TracerProgressObject to track initialization progress */ public TracerProgressObject sessionInitializing(TracerProbe[] probes, @@ -120,7 +120,7 @@ public void sessionStarting(TracerProbe[] probes, X dataSource) * * @param probes probes defined for the Tracer session * @param dataSource monitored DataSource - * @param refresh session refresh rate in miliseconds + * @param refresh session refresh rate in milliseconds */ public void refreshRateChanged(TracerProbe[] probes, X dataSource, int refresh); @@ -141,11 +141,11 @@ public void probeRemoved(TracerProbe probe, X dataSource) {} * Package to notify the user about initialization progress. The actual * initialization (and updating the TracerProgressObject) should be * performed in the sessionStarting() method. Useful for example for - * messaging a delay during instrumention of classes in target application. + * messaging a delay during instrumentation of classes in target application. * * @param probes probes defined for the Tracer session * @param dataSource monitored DataSource - * @param refresh session refresh rate in miliseconds + * @param refresh session refresh rate in milliseconds * @return TracerProgressObject null in default implementation */ public TracerProgressObject sessionInitializing(TracerProbe[] probes, diff --git a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/ProbeStateHandler.java b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/ProbeStateHandler.java index 5f0e758441..62a8ec5dce 100644 --- a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/ProbeStateHandler.java +++ b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/ProbeStateHandler.java @@ -56,10 +56,10 @@ public interface ProbeStateHandler { * Probe to notify the user about initialization progress. The actual * initialization (and updating the TracerProgressObject) should be * performed in the sessionStarting() method. Useful for example for - * messaging a delay during instrumention of classes in target application. + * messaging a delay during instrumentation of classes in target application. * * @param dataSource monitored DataSource - * @param refresh session refresh rate in miliseconds + * @param refresh session refresh rate in milliseconds * @return TracerProgressObject to track initialization progress */ public TracerProgressObject sessionInitializing(X dataSource, int refresh); @@ -111,7 +111,7 @@ public void sessionStarting(X dataSource) * Invoked when refresh rate of the Tracer session has been changed. * * @param dataSource monitored DataSource - * @param refresh session refresh rate in miliseconds + * @param refresh session refresh rate in milliseconds */ public void refreshRateChanged(X dataSource, int refresh); @@ -132,10 +132,10 @@ public void probeRemoved(X dataSource) {} * Probe to notify the user about initialization progress. The actual * initialization (and updating the TracerProgressObject) should be * performed in the sessionStarting() method. Useful for example for - * messaging a delay during instrumention of classes in target application. + * messaging a delay during instrumentation of classes in target application. * * @param dataSource monitored DataSource - * @param refresh session refresh rate in miliseconds + * @param refresh session refresh rate in milliseconds * @return TracerProgressObject null in default implementation */ public TracerProgressObject sessionInitializing(X dataSource, int refresh) { diff --git a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerPackage.java b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerPackage.java index 5f0c32e3f2..df61a740b8 100644 --- a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerPackage.java +++ b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerPackage.java @@ -214,11 +214,11 @@ protected void probeRemoved(TracerProbe probe, X dataSource) {} * Package to notify the user about initialization progress. The actual * initialization (and updating the TracerProgressObject) should be * performed in the sessionStarting() method. Useful for example for - * messaging a delay during instrumention of classes in target application. + * messaging a delay during instrumentation of classes in target application. * * @param probes probes defined for the Tracer session * @param dataSource monitored DataSource - * @param refresh session refresh rate in miliseconds + * @param refresh session refresh rate in milliseconds * @return TracerProgressObject to track initialization progress */ protected TracerProgressObject sessionInitializing(TracerProbe[] probes, @@ -276,7 +276,7 @@ protected void sessionFinished(TracerProbe[] probes, X dataSource) {} * * @param probes probes defined for the Tracer session * @param dataSource monitored DataSource - * @param refresh session refresh rate in miliseconds + * @param refresh session refresh rate in milliseconds */ protected void refreshRateChanged(TracerProbe[] probes, X dataSource, int refresh) {} diff --git a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerProbe.java b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerProbe.java index b2f189a6cc..c42f0d3778 100644 --- a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerProbe.java +++ b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerProbe.java @@ -173,10 +173,10 @@ protected void probeRemoved(X dataSource) {} * Probe to notify the user about initialization progress. The actual * initialization (and updating the TracerProgressObject) should be * performed in the sessionStarting() method. Useful for example for - * messaging a delay during instrumention of classes in target application. + * messaging a delay during instrumentation of classes in target application. * * @param dataSource monitored DataSource - * @param refresh session refresh rate in miliseconds + * @param refresh session refresh rate in milliseconds * @return TracerProgressObject to track initialization progress */ protected TracerProgressObject sessionInitializing(X dataSource, int refresh) { @@ -230,7 +230,7 @@ protected void sessionFinished(X dataSource) {} * Invoked when refresh rate of the Tracer session has been changed. * * @param dataSource monitored DataSource - * @param refresh session refresh rate in miliseconds + * @param refresh session refresh rate in milliseconds */ protected void refreshRateChanged(X dataSource, int refresh) {} diff --git a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerProgressObject.java b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerProgressObject.java index de8a16902c..eaf24129b1 100644 --- a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerProgressObject.java +++ b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerProgressObject.java @@ -112,7 +112,7 @@ public TracerProgressObject(int steps, String text) { /** * Adds a number of steps to the current initialization progress. * - * @param steps number of steps to be addded to the current initialization progress + * @param steps number of steps to be added to the current initialization progress */ public void addSteps(int steps) { addSteps(steps, text); } @@ -120,7 +120,7 @@ public TracerProgressObject(int steps, String text) { * Adds a number of steps to the current initialization progress and changes * the text describing the current state. * - * @param steps number of steps to be addded to the current initialization progress + * @param steps number of steps to be added to the current initialization progress * @param text text describing the current state */ public synchronized void addSteps(int steps, String text) { diff --git a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerSupport.java b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerSupport.java index a8b0de11b3..39be88b646 100644 --- a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerSupport.java +++ b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/TracerSupport.java @@ -61,10 +61,10 @@ public void registerPackageProvider(TracerPackageProvider provider) { /** * Unregisters TracerPackageProvider. * - * @param povider TracerPackageProvider + * @param provider TracerPackageProvider */ - public void unregisterPackageProvider(TracerPackageProvider povider) { - TracerSupportImpl.getInstance().unregisterPackageProvider(povider); + public void unregisterPackageProvider(TracerPackageProvider provider) { + TracerSupportImpl.getInstance().unregisterPackageProvider(provider); } diff --git a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/TracerView.java b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/TracerView.java index d4d7d291be..e502e0a4d8 100644 --- a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/TracerView.java +++ b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/TracerView.java @@ -519,7 +519,7 @@ public void actionPerformed(ActionEvent e) { else if (tbVis == TracerOptions.SHOW_AS_NEEDED) timelineToolbar.setVisible(timelineView.isShowing()); - addClientToobarItem(timelineToolbar); + addClientToolbarItem(timelineToolbar); } private void hideTimelineToolbar() { @@ -577,7 +577,7 @@ public void run() { updateSelectionToolbar(false); } - addClientToobarItem(selectionToolbar); + addClientToolbarItem(selectionToolbar); } private void updateSelectionToolbar(boolean dynamicSelection) { @@ -637,7 +637,7 @@ public boolean isEnabled() { else if (tbVis == TracerOptions.SHOW_AS_NEEDED) extraToolbar.setVisible(exportAllAction.isEnabled()); - addClientToobarItem(extraToolbar); + addClientToolbarItem(extraToolbar); } private void hideExtraToolbar() { @@ -648,7 +648,7 @@ private void showExtraToolbar() { if (extraToolbar != null) extraToolbar.setVisible(true); } - private void addClientToobarItem(Component c) { + private void addClientToolbarItem(Component c) { final SimpleSeparator s = createToolbarSeparator(); new VisibilityHandler() { public void shown() { s.setVisible(true); } @@ -803,7 +803,7 @@ public void run() { refreshUnitsLabel.setToolTipText("Tracer sampling frequency"); refreshRateContainer.add(refreshUnitsLabel); - addClientToobarItem(refreshRateContainer); + addClientToolbarItem(refreshRateContainer); } return view; diff --git a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/swing/LabelRenderer.java b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/swing/LabelRenderer.java index 40b662fc63..fcc44cec2b 100644 --- a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/swing/LabelRenderer.java +++ b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/swing/LabelRenderer.java @@ -141,7 +141,7 @@ public void paint(Graphics g) { } - // --- Peformance tweaks --------------------------------------------------- + // --- Performance tweaks --------------------------------------------------- // Overridden for performance reasons. public void setText(String text) { diff --git a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/timeline/TimelineLegendOverlay.java b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/timeline/TimelineLegendOverlay.java index c6e2235641..4613c9efcc 100644 --- a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/timeline/TimelineLegendOverlay.java +++ b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/timeline/TimelineLegendOverlay.java @@ -101,7 +101,7 @@ private void paint(Graphics g, int x, int y) { painter.paint(g); } - // --- Peformance tweaks --------------------------------------------------- + // --- Performance tweaks --------------------------------------------------- public void invalidate() {} diff --git a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/timeline/TimelineUnitsOverlay.java b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/timeline/TimelineUnitsOverlay.java index d73ed9c157..42e48616e8 100644 --- a/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/timeline/TimelineUnitsOverlay.java +++ b/plugins/tracer/src/org/graalvm/visualvm/modules/tracer/impl/timeline/TimelineUnitsOverlay.java @@ -127,7 +127,7 @@ private void paint(Graphics g, int x, int y) { } - // --- Peformance tweaks --------------------------------------------------- + // --- Performance tweaks --------------------------------------------------- public void invalidate() {} diff --git a/plugins/tracerdynamic/src/org/graalvm/visualvm/modules/tracer/dynamic/resources/configurator.js b/plugins/tracerdynamic/src/org/graalvm/visualvm/modules/tracer/dynamic/resources/configurator.js index 429efe7671..fd4c456a89 100644 --- a/plugins/tracerdynamic/src/org/graalvm/visualvm/modules/tracer/dynamic/resources/configurator.js +++ b/plugins/tracerdynamic/src/org/graalvm/visualvm/modules/tracer/dynamic/resources/configurator.js @@ -104,7 +104,7 @@ function L11N(baseName) { } } -function getContinousItemDescriptorProvider(formatter) { +function getContinuousItemDescriptorProvider(formatter) { formatter = formatter || ItemValueFormatter.DECIMAL; return function(property) { @@ -218,7 +218,7 @@ function getItemDescriptor(property) { } if (property.presenter.type == VisualVM.Tracer.Type.continuous) { - return getContinousItemDescriptorProvider(property.presenter.format)(property); + return getContinuousItemDescriptorProvider(property.presenter.format)(property); } else if (property.presenter.type == VisualVM.Tracer.Type.discrete) { return getDiscreteItemDescriptorProvider(property.presenter.format)(property); } diff --git a/plugins/tracerjavafx/src/org/graalvm/visualvm/modules/tracer/javafx/fx_tracer.js b/plugins/tracerjavafx/src/org/graalvm/visualvm/modules/tracer/javafx/fx_tracer.js index a774135c5b..3e9463562c 100644 --- a/plugins/tracerjavafx/src/org/graalvm/visualvm/modules/tracer/javafx/fx_tracer.js +++ b/plugins/tracerjavafx/src/org/graalvm/visualvm/modules/tracer/javafx/fx_tracer.js @@ -226,7 +226,7 @@ VisualVM.Tracer.addPackages({ { // Node count name: loc.message("VisualVM/Tracer/packages/jfx/probes/sgNode/properties/nodeCount"), - desc: "Amount of nodes in sceengraph", + desc: "Amount of nodes in scenegraph", value: mbeanAttribute("btrace:name=FxBtraceTracker", "nodeCount") } ] diff --git a/plugins/tracerjavafx/src/org/graalvm/visualvm/modules/tracer/javafx/resources/JavaFXTracer.probe b/plugins/tracerjavafx/src/org/graalvm/visualvm/modules/tracer/javafx/resources/JavaFXTracer.probe index 7f3279a279..a503c1abb7 100644 --- a/plugins/tracerjavafx/src/org/graalvm/visualvm/modules/tracer/javafx/resources/JavaFXTracer.probe +++ b/plugins/tracerjavafx/src/org/graalvm/visualvm/modules/tracer/javafx/resources/JavaFXTracer.probe @@ -194,8 +194,8 @@ import com.sun.javafx.runtime.sequence.Sequence; //println("It is sequence " + seq.size()); push(queue, it); it = seq.iterator(); - /* pulse enter point seems to be correct for computing if layouting is needed, - as long as layouting calls are done within this procedure - in this place, + /* pulse enter point seems to be correct for computing if layout is needed, + as long as layout calls are done within this procedure - in this place, all needsLayout must be set IMO */ } if(((javafx.scene.Node)object).get$parent().get$needsLayout()){ @@ -378,20 +378,20 @@ import com.sun.javafx.runtime.sequence.Sequence; // //key/mouse events - keyPulsesCumulativeTime = kCumulativeTime/1000000; //in miliSec + keyPulsesCumulativeTime = kCumulativeTime/1000000; //in milliSec kCumulativeTime = 0L; - mousePulsesCumulativeTime = mCumulativeTime/1000000; //in miliSec + mousePulsesCumulativeTime = mCumulativeTime/1000000; //in milliSec mCumulativeTime = 0L; // // //paint - paintCumulativeTime = pCumulativeTime/1000000; //in miliSec + paintCumulativeTime = pCumulativeTime/1000000; //in milliSec pCumulativeTime = 0L; //dirty regions - dirtyRegionsCumulativeTime = dCumulativeTime/1000000; //in miliSec + dirtyRegionsCumulativeTime = dCumulativeTime/1000000; //in milliSec dCumulativeTime = 0L; // diff --git a/plugins/tracerjvm/src/org/graalvm/visualvm/modules/tracer/jvm/resources/platform_mx.js b/plugins/tracerjvm/src/org/graalvm/visualvm/modules/tracer/jvm/resources/platform_mx.js index e60d2ffb1f..bfe63e7bf1 100644 --- a/plugins/tracerjvm/src/org/graalvm/visualvm/modules/tracer/jvm/resources/platform_mx.js +++ b/plugins/tracerjvm/src/org/graalvm/visualvm/modules/tracer/jvm/resources/platform_mx.js @@ -213,7 +213,7 @@ VisualVM.Tracer.addPackages([{ }, { name: "Reclaimed Memory", - desc: "The amout of memory reclaimed during the last GC run", + desc: "The amount of memory reclaimed during the last GC run", properties: getReclaimedMemory() }, { diff --git a/samples/apptype/src/org/visualvm/demoapplicationtype/AnagramAction.java b/samples/apptype/src/org/visualvm/demoapplicationtype/AnagramAction.java index aab6774084..89b70f2060 100644 --- a/samples/apptype/src/org/visualvm/demoapplicationtype/AnagramAction.java +++ b/samples/apptype/src/org/visualvm/demoapplicationtype/AnagramAction.java @@ -16,7 +16,7 @@ public class AnagramAction extends SingleDataSourceAction { public AnagramAction() { super(Application.class); putValue(Action.NAME, "Show Anagram PID"); - putValue(Action.SHORT_DESCRIPTION, "Demoes a menu item"); + putValue(Action.SHORT_DESCRIPTION, "Demos a menu item"); } @Override diff --git a/samples/killapp/src/org/graalvm/visualvm/modules/killapp/Bundle.properties b/samples/killapp/src/org/graalvm/visualvm/modules/killapp/Bundle.properties index 7f9ea365e8..aa09e04f63 100644 --- a/samples/killapp/src/org/graalvm/visualvm/modules/killapp/Bundle.properties +++ b/samples/killapp/src/org/graalvm/visualvm/modules/killapp/Bundle.properties @@ -1,5 +1,5 @@ OpenIDE-Module-Display-Category=Tools OpenIDE-Module-Long-Description=\ - This simple module adds ability to quicky kill locally running Java application. + This simple module adds ability to quickly kill locally running Java application. OpenIDE-Module-Name=KillApplication OpenIDE-Module-Short-Description=Kill Application diff --git a/samples/subnodes/src/org/visualvm/demoapplicationtype/model/AnagramModelProvider.java b/samples/subnodes/src/org/visualvm/demoapplicationtype/model/AnagramModelProvider.java index f1872534ca..ca43f02fcf 100644 --- a/samples/subnodes/src/org/visualvm/demoapplicationtype/model/AnagramModelProvider.java +++ b/samples/subnodes/src/org/visualvm/demoapplicationtype/model/AnagramModelProvider.java @@ -14,7 +14,7 @@ public class AnagramModelProvider implements DataChangeListener, Da //~ Static fields/initializers ----------------------------------------------------------------------------------------------- private static final AnagramModelProvider INSTANCE = new AnagramModelProvider(); - private final DataRemovedListener removelListener = new DataRemovedListener() { + private final DataRemovedListener removalListener = new DataRemovedListener() { public void dataRemoved(Application app) { processFinishedApplication(app); @@ -66,7 +66,7 @@ private void processNewApplication(final Application app) { if (ApplicationTypeFactory.getApplicationTypeFor(app) instanceof AnagramApplicationType) { AnagramModel am = new AnagramModel(app); app.getRepository().addDataSource(am); - app.notifyWhenRemoved(removelListener); + app.notifyWhenRemoved(removalListener); } } diff --git a/templates/apisupport/src/org/graalvm/visualvm/apisupport/actions/templateAction.javx b/templates/apisupport/src/org/graalvm/visualvm/apisupport/actions/templateAction.javx index e9d90da2e1..d2a5fab37b 100644 --- a/templates/apisupport/src/org/graalvm/visualvm/apisupport/actions/templateAction.javx +++ b/templates/apisupport/src/org/graalvm/visualvm/apisupport/actions/templateAction.javx @@ -22,7 +22,7 @@ public class ${TEMPLATENAME}Action extends SingleDataSourceAction<${DISPLAYNAME} public ${TEMPLATENAME}Action() { super(${DISPLAYNAME}.class); putValue(Action.NAME, "${TEMPLATENAME}"); - putValue(Action.SHORT_DESCRIPTION, "Demoes a menu item"); + putValue(Action.SHORT_DESCRIPTION, "Demos a menu item"); } @Override diff --git a/visualvm/application/src/org/graalvm/visualvm/application/Application.java b/visualvm/application/src/org/graalvm/visualvm/application/Application.java index 64ab1ce21c..f0d49981df 100644 --- a/visualvm/application/src/org/graalvm/visualvm/application/Application.java +++ b/visualvm/application/src/org/graalvm/visualvm/application/Application.java @@ -39,7 +39,7 @@ /** * Abstract implementation of Application. - * Each application is defined by a Host on which it's running and an unique identificator. + * Each application is defined by a Host on which it's running and an unique identifier. * * @author Jiri Sedlacek */ @@ -60,20 +60,20 @@ public abstract class Application extends StatefulDataSource { /** - * Creates new instance of Application defined by a Host and unique identificator. + * Creates new instance of Application defined by a Host and unique identifier. * * @param host Host on which the application is running. - * @param id unique identificator of the application. + * @param id unique identifier of the application. */ public Application(Host host, String id) { this(host, id, STATE_AVAILABLE); } /** - * Creates new instance of Application defined by a Host and unique identificator. + * Creates new instance of Application defined by a Host and unique identifier. * * @param host Host on which the application is running. - * @param id unique identificator of the application. + * @param id unique identifier of the application. * @param state initial state of the application. */ protected Application(Host host, String id, int state) { @@ -86,9 +86,9 @@ protected Application(Host host, String id, int state) { /** - * Returns unique identificator of the application. + * Returns unique identifier of the application. * - * @return unique identificator of the application. + * @return unique identifier of the application. */ public final String getId() { return id; diff --git a/visualvm/application/src/org/graalvm/visualvm/application/ApplicationDescriptor.java b/visualvm/application/src/org/graalvm/visualvm/application/ApplicationDescriptor.java index e6c6a98a7f..52ab49b2fe 100644 --- a/visualvm/application/src/org/graalvm/visualvm/application/ApplicationDescriptor.java +++ b/visualvm/application/src/org/graalvm/visualvm/application/ApplicationDescriptor.java @@ -124,7 +124,7 @@ public void propertyChange(PropertyChangeEvent evt) { setName((String)evt.getNewValue()); name = ApplicationDescriptor.super.getName(); } else { - // Descriptor doesn't support renaming, set name for overriden getName() + // Descriptor doesn't support renaming, set name for overridden getName() String oldName = name; name = formatName(createGenericName(application, type.getName())); PropertyChangeSupport pcs = ApplicationDescriptor.this.getChangeSupport(); @@ -168,7 +168,7 @@ protected static String resolveCustomName(Application application) { String args = jvm.getJvmArgs(); int propIndex = args.indexOf(DISPLAY_NAME_PROPERTY); - if (propIndex != -1) { // display name propery detected on commandline + if (propIndex != -1) { // display name property detected on commandline propIndex += DISPLAY_NAME_PROPERTY.length(); int endIndex = args.indexOf(" ", propIndex); // NOI18N if (endIndex == -1) return args.substring(propIndex); diff --git a/visualvm/application/src/org/graalvm/visualvm/application/jvm/package-info.java b/visualvm/application/src/org/graalvm/visualvm/application/jvm/package-info.java index 1d4f12d28c..2d2c587602 100644 --- a/visualvm/application/src/org/graalvm/visualvm/application/jvm/package-info.java +++ b/visualvm/application/src/org/graalvm/visualvm/application/jvm/package-info.java @@ -24,7 +24,7 @@ */ /** - * This package uses Jvmstat, JMX, SA and Attach API to present unifiled view for JVM. - * The implemnetation uses the fastest method to get the requested infomation or operation. + * This package uses Jvmstat, JMX, SA and Attach API to present unified view for JVM. + * The implementation uses the fastest method to get the requested information or operation. */ package org.graalvm.visualvm.application.jvm; diff --git a/visualvm/application/src/org/graalvm/visualvm/application/type/ApplicationType.java b/visualvm/application/src/org/graalvm/visualvm/application/type/ApplicationType.java index 232be210a3..59eb0a8eeb 100644 --- a/visualvm/application/src/org/graalvm/visualvm/application/type/ApplicationType.java +++ b/visualvm/application/src/org/graalvm/visualvm/application/type/ApplicationType.java @@ -31,7 +31,7 @@ import java.beans.PropertyChangeSupport; /** - * This class is used to indetify different type of Java + * This class is used to identify different type of Java * applications. Using this class you can obtain * application's name and icon. VisualVM plugins can * use instances of this class to identify particular diff --git a/visualvm/application/src/org/graalvm/visualvm/application/type/IntellijApplicationTypeFactory.java b/visualvm/application/src/org/graalvm/visualvm/application/type/IntellijApplicationTypeFactory.java index 94b4613e95..fa7ffb2122 100644 --- a/visualvm/application/src/org/graalvm/visualvm/application/type/IntellijApplicationTypeFactory.java +++ b/visualvm/application/src/org/graalvm/visualvm/application/type/IntellijApplicationTypeFactory.java @@ -43,7 +43,7 @@ public class IntellijApplicationTypeFactory extends MainClassApplicationTypeFact private static final String PLATFORM_NAME = "IntelliJ Platform"; // NOI18N /** - * Detects IntelliJ Plaform application. It returns + * Detects IntelliJ Platform application. It returns * {@link IntellijApplicationType} for IntelliJ Platform application. * * @return {@link ApplicationType} subclass or null if diff --git a/visualvm/application/src/org/graalvm/visualvm/application/type/MainClassApplicationTypeFactory.java b/visualvm/application/src/org/graalvm/visualvm/application/type/MainClassApplicationTypeFactory.java index 7ff34f95b4..c0a95471bc 100644 --- a/visualvm/application/src/org/graalvm/visualvm/application/type/MainClassApplicationTypeFactory.java +++ b/visualvm/application/src/org/graalvm/visualvm/application/type/MainClassApplicationTypeFactory.java @@ -69,7 +69,7 @@ public class MainClassApplicationTypeFactory extends AbstractModelProvider" + LIVE_THRADS + ": " + liveThreads + "
"); // NOI18N + data.append("" + LIVE_THREADS + ": " + liveThreads + "
"); // NOI18N data.append("" + DAEMON_THREADS + ": " + daemonThreads + "
"); // NOI18N int selStart = area.getSelectionStart(); diff --git a/visualvm/applicationviews/src/org/graalvm/visualvm/application/views/threads/DeadlockDetector.java b/visualvm/applicationviews/src/org/graalvm/visualvm/application/views/threads/DeadlockDetector.java index ff303d7822..ea5be214c6 100644 --- a/visualvm/applicationviews/src/org/graalvm/visualvm/application/views/threads/DeadlockDetector.java +++ b/visualvm/applicationviews/src/org/graalvm/visualvm/application/views/threads/DeadlockDetector.java @@ -38,7 +38,7 @@ class DeadlockDetector { private static final Logger LOGGER = Logger.getLogger(DeadlockDetector.class.getName()); private static int deadlockNumber = 10; private ThreadMXBean threadBean; - private boolean deadlockDectionDisabled; + private boolean deadlockDetectionDisabled; private boolean findDeadlockedThreadsSupported; private int countDown; @@ -50,7 +50,7 @@ class DeadlockDetector { long[] detectDeadlock() { long threadIds[]; - if (deadlockDectionDisabled) { + if (deadlockDetectionDisabled) { return null; } if (countDown++ % deadlockNumber != 0) { @@ -64,7 +64,7 @@ long[] detectDeadlock() { } } catch (SecurityException ex) { LOGGER.throwing(ThreadMXBeanDataManager.class.getName(), "detectDeadlock", ex); // NOI18N - deadlockDectionDisabled = true; + deadlockDetectionDisabled = true; return null; } catch (UnsupportedOperationException ex) { tryJdk15(ex); @@ -93,7 +93,7 @@ private void tryJdk15(Exception ex) { detectDeadlock(); } else { LOGGER.throwing(ThreadMXBeanDataManager.class.getName(), "detectDeadlock", ex); // NOI18N - deadlockDectionDisabled = true; + deadlockDetectionDisabled = true; } } } \ No newline at end of file diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/AboutAction.java b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/AboutAction.java index 4a7cbba75e..76577d7cb8 100644 --- a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/AboutAction.java +++ b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/AboutAction.java @@ -180,9 +180,9 @@ private static String getJavaInfo() { Properties systemProperties = System.getProperties(); String javaVersion = systemProperties.getProperty("java.version", "unknown"); // NOI18N String vmName = systemProperties.getProperty("java.vm.name", "<not available>"); // NOI18N - String vmVerison = systemProperties.getProperty("java.vm.version", ""); // NOI18N + String vmVersion = systemProperties.getProperty("java.vm.version", ""); // NOI18N String vmInfo = systemProperties.getProperty("java.vm.info", ""); // NOI18N - return javaVersion + "; " + vmName + " (" + vmVerison + ", " + vmInfo + ")"; + return javaVersion + "; " + vmName + " (" + vmVersion + ", " + vmInfo + ")"; } private static String getJavaVendor() { diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/AboutDialogControls.java b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/AboutDialogControls.java index 9643db51d7..d1c1b49531 100644 --- a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/AboutDialogControls.java +++ b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/AboutDialogControls.java @@ -155,7 +155,7 @@ protected void fireActionPerformed(ActionEvent event) { tb.copyAllHtmlToClipboard(); JOptionPane.showMessageDialog(AboutDialog.getInstance().getDialog(), NbBundle.getMessage(AboutDialogControls.class, "MSG_Copy_Clipboard"), // NOI18N - NbBundle.getMessage(AboutDialogControls.class, "CAPTION_Copy_Clipbard"), // NOI18N + NbBundle.getMessage(AboutDialogControls.class, "CAPTION_Copy_Clipboard"), // NOI18N JOptionPane.INFORMATION_MESSAGE); } }; diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/Bundle.properties b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/Bundle.properties index 2f0974df5a..63b5e5a67e 100644 --- a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/Bundle.properties +++ b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/Bundle.properties @@ -48,7 +48,7 @@ LBL_Logfile_Viewer_=Logfile Viewer ({0}) BTN_Copy_Clipboard=C&opy to Clipboard -CAPTION_Copy_Clipbard=Copy To Clipboard +CAPTION_Copy_Clipboard=Copy To Clipboard MSG_Copy_Clipboard=Details copied to the clipboard. diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/options/NetworkOptionsModel.java b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/options/NetworkOptionsModel.java index f6267a3050..785c450ce1 100644 --- a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/options/NetworkOptionsModel.java +++ b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/options/NetworkOptionsModel.java @@ -291,7 +291,7 @@ private static void testProxy(NetworkOptionsPanel panel, int proxyType, } break; case ProxySettings.MANUAL_SET_PAC: - // Never should get here, user cannot set up PAC manualy from IDE + // Never should get here, user cannot set up PAC manually from IDE default: testingProxy = Proxy.NO_PROXY; } diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/options/ProxySettings.java b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/options/ProxySettings.java index bc9ff05038..24f1e28ac1 100644 --- a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/options/ProxySettings.java +++ b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/options/ProxySettings.java @@ -262,7 +262,7 @@ private static String getModifiedNonProxyHosts (String systemPreset) { String fromSystem = systemPreset.replaceAll (";", "|").replaceAll (",", "|"); //NOI18N String fromUser = getPresetNonProxyHosts () == null ? "" : getPresetNonProxyHosts ().replaceAll (";", "|").replaceAll (",", "|"); //NOI18N if (Utilities.isWindows ()) { - fromSystem = addReguralToNonProxyHosts (fromSystem); + fromSystem = addRegularToNonProxyHosts (fromSystem); } final String staticNonProxyHosts = NbBundle.getMessage(ProxySettings.class, "StaticNonProxyHosts"); // NOI18N String nonProxy = concatProxies(fromUser, fromSystem, staticNonProxyHosts); // NOI18N @@ -332,20 +332,20 @@ private static String compactNonProxyHosts (String hosts) { return compactedProxyHosts.toString(); } - private static String addReguralToNonProxyHosts (String nonProxyHost) { + private static String addRegularToNonProxyHosts (String nonProxyHost) { StringTokenizer st = new StringTokenizer (nonProxyHost, "|"); // NOI18N - StringBuilder reguralProxyHosts = new StringBuilder(); + StringBuilder regularProxyHosts = new StringBuilder(); while (st.hasMoreTokens ()) { String t = st.nextToken (); if (t.indexOf ('*') == -1) { //NOI18N t = t + '*'; //NOI18N } - if (reguralProxyHosts.length() > 0) - reguralProxyHosts.append('|'); // NOI18N - reguralProxyHosts.append(t); + if (regularProxyHosts.length() > 0) + regularProxyHosts.append('|'); // NOI18N + regularProxyHosts.append(t); } - return reguralProxyHosts.toString(); + return regularProxyHosts.toString(); } public static String normalizeProxyHost (String proxyHost) { diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/welcome/WelcomeComponent.java b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/welcome/WelcomeComponent.java index d267b3b219..d4b3b3defa 100644 --- a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/welcome/WelcomeComponent.java +++ b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/welcome/WelcomeComponent.java @@ -117,7 +117,7 @@ public static synchronized WelcomeComponent createComp() { return wc; } - /** Overriden to explicitely set persistence type of WelcomeComponent + /** Overridden to explicitly set persistence type of WelcomeComponent * to PERSISTENCE_ALWAYS */ @Override public int getPersistenceType() { return TopComponent.PERSISTENCE_NEVER; diff --git a/visualvm/attach/src/org/graalvm/visualvm/attach/HeapHistogramImpl.java b/visualvm/attach/src/org/graalvm/visualvm/attach/HeapHistogramImpl.java index 4712b8f529..cf324cf227 100644 --- a/visualvm/attach/src/org/graalvm/visualvm/attach/HeapHistogramImpl.java +++ b/visualvm/attach/src/org/graalvm/visualvm/attach/HeapHistogramImpl.java @@ -247,7 +247,7 @@ String convertJVMName(String jvmName) { name=jvmName.substring(index+2,jvmName.length()-1); break; default: - System.err.println("Uknown name "+jvmName); // NOI18N + System.err.println("Unknown name "+jvmName); // NOI18N name = jvmName; } for (int i=0;i<=index;i++) { diff --git a/visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/SoftReferenceEx.java b/visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/SoftReferenceEx.java index 5edc4cf6a7..2768f9543c 100644 --- a/visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/SoftReferenceEx.java +++ b/visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/SoftReferenceEx.java @@ -29,7 +29,7 @@ import java.lang.ref.SoftReference; /** - * Extended {@linkplain SoftReference} to allow euqals() and hashCode() + * Extended {@linkplain SoftReference} to allow equals() and hashCode() * to be computed from the referenced object * * @author Jaroslav Bachorik diff --git a/visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/WeakReferenceEx.java b/visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/WeakReferenceEx.java index 97899dc9ce..d814cf4085 100644 --- a/visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/WeakReferenceEx.java +++ b/visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/WeakReferenceEx.java @@ -29,7 +29,7 @@ import java.lang.ref.WeakReference; /** - * Extended {@linkplain WeakReference} to allow euqals() and hashCode() + * Extended {@linkplain WeakReference} to allow equals() and hashCode() * to be computed from the referenced object * * @author Jaroslav Bachorik diff --git a/visualvm/caching.api/test/unit/src/com/sun/tools/visualvm/api/caching/impl/SoftReferenceExTest.java b/visualvm/caching.api/test/unit/src/com/sun/tools/visualvm/api/caching/impl/SoftReferenceExTest.java index fd9704521b..d2883e07d9 100644 --- a/visualvm/caching.api/test/unit/src/com/sun/tools/visualvm/api/caching/impl/SoftReferenceExTest.java +++ b/visualvm/caching.api/test/unit/src/com/sun/tools/visualvm/api/caching/impl/SoftReferenceExTest.java @@ -65,7 +65,7 @@ public void testEqualsNonEmpty() { System.out.println("equals - non empty"); SoftReferenceEx instance1 = new SoftReferenceEx("xxx"); SoftReferenceEx instance2 = new SoftReferenceEx("xxx"); - // equals must yield the equals result of the referrents + // equals must yield the equals result of the reference assertEquals(instance2, instance1); // also, the hashcodes must be the same for equaling references assertEquals(instance2.hashCode(), instance1.hashCode()); @@ -91,7 +91,7 @@ public void testNotEqualsNonEmpty() { System.out.println("equals - non empty"); SoftReferenceEx instance1 = new SoftReferenceEx("xxx"); SoftReferenceEx instance2 = new SoftReferenceEx("yyy"); - // equals must yield the equals result of the referrents + // equals must yield the equals result of the reference assertFalse(instance2.equals(instance1)); // also, the hashcodes must not be the same for non-equaling references assertFalse(instance2.hashCode() == instance1.hashCode()); diff --git a/visualvm/caching.api/test/unit/src/com/sun/tools/visualvm/api/caching/impl/WeakReferenceExTest.java b/visualvm/caching.api/test/unit/src/com/sun/tools/visualvm/api/caching/impl/WeakReferenceExTest.java index 8fa5318638..deec871be6 100644 --- a/visualvm/caching.api/test/unit/src/com/sun/tools/visualvm/api/caching/impl/WeakReferenceExTest.java +++ b/visualvm/caching.api/test/unit/src/com/sun/tools/visualvm/api/caching/impl/WeakReferenceExTest.java @@ -65,7 +65,7 @@ public void testEqualsNonEmpty() { System.out.println("equals - non empty"); WeakReferenceEx instance1 = new WeakReferenceEx("xxx"); WeakReferenceEx instance2 = new WeakReferenceEx("xxx"); - // equals must yield the equals result of the referrents + // equals must yield the equals result of the reference assertEquals(instance2, instance1); // also, the hashcodes must be the same for equaling references assertEquals(instance2.hashCode(), instance1.hashCode()); @@ -91,7 +91,7 @@ public void testNotEqualsNonEmpty() { System.out.println("equals - non empty"); WeakReferenceEx instance1 = new WeakReferenceEx("xxx"); WeakReferenceEx instance2 = new WeakReferenceEx("yyy"); - // equals must yield the equals result of the referrents + // equals must yield the equals result of the reference assertFalse(instance2.equals(instance1)); // also, the hashcodes must not be the same for non-equaling references assertFalse(instance2.hashCode() == instance1.hashCode()); diff --git a/visualvm/charts/src/org/graalvm/visualvm/charts/SimpleXYChartSupport.java b/visualvm/charts/src/org/graalvm/visualvm/charts/SimpleXYChartSupport.java index 804c8a22c2..96a68585b5 100644 --- a/visualvm/charts/src/org/graalvm/visualvm/charts/SimpleXYChartSupport.java +++ b/visualvm/charts/src/org/graalvm/visualvm/charts/SimpleXYChartSupport.java @@ -107,7 +107,7 @@ public JComponent getChart() { * Saves chart values into the provided OutputStream. This method should not * be called in the Event Dispatch Thread. * - * @param os OuptutStream into which to save the chart values + * @param os OutputStream into which to save the chart values * @throws IOException if an I/O error occurs */ public void saveValues(OutputStream os) throws IOException { diff --git a/visualvm/core/src/org/graalvm/visualvm/core/datasource/DataSource.java b/visualvm/core/src/org/graalvm/visualvm/core/datasource/DataSource.java index 121115a539..2f354ad23a 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/datasource/DataSource.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/datasource/DataSource.java @@ -226,7 +226,7 @@ public boolean supportsUserRemove() { /** * Adds a DataRemovedListener to be notified when the DataSource is removed from the tree. - * Note that this listener cannot be explicitely unregistered, it's weakly referenced and will + * Note that this listener cannot be explicitly unregistered, it's weakly referenced and will * be notified up to once and then unregistered automatically. * * @param listener DataRemovedListener to be notified when the DataSource is removed from the tree. diff --git a/visualvm/core/src/org/graalvm/visualvm/core/datasource/DataSourceContainer.java b/visualvm/core/src/org/graalvm/visualvm/core/datasource/DataSourceContainer.java index d7602ed068..2a7c4c7aab 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/datasource/DataSourceContainer.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/datasource/DataSourceContainer.java @@ -29,7 +29,7 @@ /** * Default implementation of DataSourceContainer. - * This class implements all neccessary methods to act as a repository of a DataSource (DataSource.getRepository()). + * This class implements all necessary methods to act as a repository of a DataSource (DataSource.getRepository()). * * @author Jiri Sedlacek */ @@ -40,7 +40,7 @@ public final class DataSourceContainer extends DataSourceProvider { /** * Default implementation of DataSourceContainer. - * DataSoures can benefit from using this class which implements + * DataSource can benefit from using this class which implements * managing created DataSource instances and firing the events to listeners * as their repositories. * diff --git a/visualvm/core/src/org/graalvm/visualvm/core/datasource/descriptor/DataSourceDescriptor.java b/visualvm/core/src/org/graalvm/visualvm/core/datasource/descriptor/DataSourceDescriptor.java index 636d9f853c..e0819743de 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/datasource/descriptor/DataSourceDescriptor.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/datasource/descriptor/DataSourceDescriptor.java @@ -123,7 +123,7 @@ public DataSourceDescriptor(X ds, String n, String desc, Image ic, int pos, int dataSource = ds; changeSupport = new PropertyChangeSupport(dataSource); - name = formatName(n); // NOTE: called after dataSource is set, should work fine in subclasses with overriden formatName() + name = formatName(n); // NOTE: called after dataSource is set, should work fine in subclasses with overridden formatName() description = desc; icon = ic; preferredPosition = pos; diff --git a/visualvm/core/src/org/graalvm/visualvm/core/datasupport/DataChangeSupport.java b/visualvm/core/src/org/graalvm/visualvm/core/datasupport/DataChangeSupport.java index 6ce776c1d1..6a48a2e327 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/datasupport/DataChangeSupport.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/datasupport/DataChangeSupport.java @@ -103,7 +103,7 @@ private static class ChangeSupport { private void addChangeListener(DataChangeListener listener) { if (!listeners.add(listener)) { - throw new IllegalArgumentException("Listener " + listener + " already registed"); // NOI18N + throw new IllegalArgumentException("Listener " + listener + " already registered"); // NOI18N } if (currentSet != null) { DataChangeEvent event = new DataChangeEvent(currentSet, currentSet, null); diff --git a/visualvm/core/src/org/graalvm/visualvm/core/model/ModelFactory.java b/visualvm/core/src/org/graalvm/visualvm/core/model/ModelFactory.java index ba10f3de7c..486dcc50fc 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/model/ModelFactory.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/model/ModelFactory.java @@ -207,7 +207,7 @@ public int compare(ModelProvider provider1, ModelProvider provider2) if (thisVal>anotherVal) { return -1; } - // same depth -> use class name to create artifical ordering + // same depth -> use class name to create artificial ordering return ClassNameComparator.INSTANCE.compare(provider1, provider2); } } diff --git a/visualvm/core/src/org/graalvm/visualvm/core/model/ModelProvider.java b/visualvm/core/src/org/graalvm/visualvm/core/model/ModelProvider.java index 3605fcf515..b700e86ec7 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/model/ModelProvider.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/model/ModelProvider.java @@ -29,7 +29,7 @@ /** * This interface should be implemented if you want to extend ModelFactory - * with your own provider. Implementors of this ModelProvider inteface + * with your own provider. Implementors of this ModelProvider interface * should be registered with appropriate {@link ModelFactory} using * {@link ModelFactory#registerProvider(ModelProvider)} * @author Tomas Hurka diff --git a/visualvm/core/src/org/graalvm/visualvm/core/options/GlobalPreferences.java b/visualvm/core/src/org/graalvm/visualvm/core/options/GlobalPreferences.java index aaae60ed6a..3fef8633ac 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/options/GlobalPreferences.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/options/GlobalPreferences.java @@ -315,12 +315,12 @@ private void addListener(String property, PreferenceChangeListener pcl) { } } - private int getPollingInterval(String property, int deflt) { + private int getPollingInterval(String property, int default_) { int value = -1; synchronized (prefs) { value = prefs.getInt(property, -1); if (value == -1) { - value = deflt; + value = default_; prefs.putInt(property, value); } } diff --git a/visualvm/core/src/org/graalvm/visualvm/core/options/UISupport.java b/visualvm/core/src/org/graalvm/visualvm/core/options/UISupport.java index 5ece84fc3d..edd25c2aec 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/options/UISupport.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/options/UISupport.java @@ -39,11 +39,11 @@ public final class UISupport { /** - * Creates preformated instance of SectionSeparator to be used in Options + * Creates preformatted instance of SectionSeparator to be used in Options * dialog. * * @param caption section name - * @return preformated instance of SectionSeparator + * @return preformatted instance of SectionSeparator */ public static SectionSeparator createSectionSeparator(String caption) { return new SectionSeparator(caption); diff --git a/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesCustomizer.java b/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesCustomizer.java index 3cfedbdce4..86cdcba1bf 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesCustomizer.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesCustomizer.java @@ -114,7 +114,7 @@ public void propertiesDefined(X dataSource) { * Invokes PropertiesProvider.propertiesCancelled method for every * PropertiesProvider supporting the DataSource type defined for this * PropertiesCustomizer. To be called by DataSource providers when the New - * DataSource dialog displaying editable properites has been cancelled and + * DataSource dialog displaying editable properties has been cancelled and * no DataSource has been created. */ public void propertiesCancelled() { diff --git a/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesProvider.java b/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesProvider.java index af207eb1f5..7e95dcd358 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesProvider.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesProvider.java @@ -113,7 +113,7 @@ public PropertiesProvider(String propertiesName, String propertiesDescription, /** * Returns a PropertiesPanel instance to create or edit the properties. If * the provided DataSource is null it means that the DataSource is being - * created and the properites will define the initial state. Otherwise the + * created and the properties will define the initial state. Otherwise the * DataSource properties are being edited. * * Note: if using custom JPanel instances in the PropertiesPanel be sure to use diff --git a/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesSupport.java b/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesSupport.java index b0354f4278..4588232b57 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesSupport.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/properties/PropertiesSupport.java @@ -126,7 +126,7 @@ public PropertiesCustomizer getCustomizer(Class typ } /** - * Opens Properites window of the DataSource. The first category is selected. + * Opens Properties window of the DataSource. The first category is selected. * * @param dataSource DataSource for which to open the Properties window */ @@ -135,7 +135,7 @@ public void openProperties(DataSource dataSource) { } /** - * Opens Properites window of the DataSource and selects the provided category + * Opens Properties window of the DataSource and selects the provided category * if available. * * @param dataSource DataSource for which to open the Properties window diff --git a/visualvm/core/src/org/graalvm/visualvm/core/scheduler/Quantum.java b/visualvm/core/src/org/graalvm/visualvm/core/scheduler/Quantum.java index b107d91cf0..bc9ed33a43 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/scheduler/Quantum.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/scheduler/Quantum.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; /** - * This class {@linkplain TimeUnit} and provides easy conversion and comparation + * This class {@linkplain TimeUnit} and provides easy conversion and comparison * between various units * @author Jaroslav Bachorik */ diff --git a/visualvm/core/src/org/graalvm/visualvm/core/scheduler/Scheduler.java b/visualvm/core/src/org/graalvm/visualvm/core/scheduler/Scheduler.java index 2339aa41b3..f976272503 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/scheduler/Scheduler.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/scheduler/Scheduler.java @@ -31,7 +31,7 @@ /** * An interval based scheduler service * Used to execute various tasks at the predefined interval - * There is supposed to be only one instance of this class accesible vie getSharedInstance() + * There is supposed to be only one instance of this class accessible vie getSharedInstance() * @author Jaroslav Bachorik */ public class Scheduler { @@ -57,7 +57,7 @@ public static final Scheduler sharedInstance() { /** * Schedules a new task to be executed with the given interval - * The newly scheduled task is exeucted out-of-order at the moment of scheduling it + * The newly scheduled task is executed out-of-order at the moment of scheduling it * This operation's result should be cached by the caller;otherwise the task will get unscheduled immediately * @param task The task to be executed * @param interval The interval to execute the task @@ -72,7 +72,7 @@ public final ScheduledTask schedule(SchedulerTask task, Quantum interval) { * This operation's result should be cached by the caller;otherwise the task will get unscheduled immediately * @param task The task to be executed * @param interval The interval to execute the task - * @param immediate Tells whether the newly scheduled task is exeucted out-of-order at the moment of scheduling it + * @param immediate Tells whether the newly scheduled task is executed out-of-order at the moment of scheduling it * @return Returns an instance of ScheduledTask that can be used to later modify the interval of execution */ public final ScheduledTask schedule(final SchedulerTask task, final Quantum interval, boolean immediate) { diff --git a/visualvm/core/src/org/graalvm/visualvm/core/snapshot/SnapshotCategory.java b/visualvm/core/src/org/graalvm/visualvm/core/snapshot/SnapshotCategory.java index b212403a7e..6e8daa5525 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/snapshot/SnapshotCategory.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/snapshot/SnapshotCategory.java @@ -110,7 +110,7 @@ public boolean supportsOpenSnapshot() { /** * Opens a saved snapshot. * Default implementation does nothing, custom implementations should open - * an Open File dialog and open the choosen snapshot. + * an Open File dialog and open the chosen snapshot. * Throws an UnsupportedOperationException if supportsOpenSnapshot() returns false. * * @param file saved snapshot. diff --git a/visualvm/core/src/org/graalvm/visualvm/core/snapshot/SnapshotsSupport.java b/visualvm/core/src/org/graalvm/visualvm/core/snapshot/SnapshotsSupport.java index 141af32e2e..f90bc6bbaf 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/snapshot/SnapshotsSupport.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/snapshot/SnapshotsSupport.java @@ -107,10 +107,10 @@ public void run() { } /** - * Creates a timestamp String (typically used in Snaphshot filename). + * Creates a timestamp String (typically used in Snapshot filename). * * @param time - * @return timestamp String (typically used in Snaphshot filename). + * @return timestamp String (typically used in Snapshot filename). */ public String getTimeStamp(long time) { return org.graalvm.visualvm.lib.jfluid.utils.StringUtils.formatUserDate(new Date(time)); diff --git a/visualvm/core/src/org/graalvm/visualvm/core/ui/DataSourceView.java b/visualvm/core/src/org/graalvm/visualvm/core/ui/DataSourceView.java index 8f9452ce5f..ff8387ee89 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/ui/DataSourceView.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/ui/DataSourceView.java @@ -171,7 +171,7 @@ protected void willBeRemoved() { } /** - * Notification when the view has been either programatically removed from tabbed pane or closed by the user by clicking the X. + * Notification when the view has been either programmatically removed from tabbed pane or closed by the user by clicking the X. * This notification comes from a thread other than EDT */ protected void removed() { diff --git a/visualvm/core/src/org/graalvm/visualvm/core/ui/DataSourceViewPlugin.java b/visualvm/core/src/org/graalvm/visualvm/core/ui/DataSourceViewPlugin.java index 830e6fecbd..f1939e51d0 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/ui/DataSourceViewPlugin.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/ui/DataSourceViewPlugin.java @@ -40,7 +40,7 @@ public abstract class DataSourceViewPlugin { /** - * Creates new DataSourrceViewPlugin for a DataSource. + * Creates new DataSourceViewPlugin for a DataSource. * * @param dataSource DataSource for which to add the plugin. */ @@ -85,7 +85,7 @@ protected void added() { } /** - * Notification when the view has been either programatically removed from tabbed pane or closed by the user by clicking the X. + * Notification when the view has been either programmatically removed from tabbed pane or closed by the user by clicking the X. * This notification comes from a thread other than EDT */ protected void removed() { diff --git a/visualvm/core/src/org/graalvm/visualvm/core/ui/actions/VisualVMDropHandler.java b/visualvm/core/src/org/graalvm/visualvm/core/ui/actions/VisualVMDropHandler.java index a8b16dcd07..8cd1624224 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/ui/actions/VisualVMDropHandler.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/ui/actions/VisualVMDropHandler.java @@ -99,7 +99,7 @@ public boolean handleDrop(DropTargetDropEvent e) { //#158473: Activate target TC to inform winsys in which mode new editor //component should be opened. It assumes that openFile opens new editor component //in some editor mode. If there would be problem with activating another TC first - //then another way how to infrom winsys must be used. + //then another way how to inform winsys must be used. Component c = e.getDropTargetContext().getComponent(); while (c != null) { if (c instanceof TopComponent) { diff --git a/visualvm/core/src/org/graalvm/visualvm/core/ui/components/LevelIndicator.java b/visualvm/core/src/org/graalvm/visualvm/core/ui/components/LevelIndicator.java index 019d5879a4..0056190839 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/ui/components/LevelIndicator.java +++ b/visualvm/core/src/org/graalvm/visualvm/core/ui/components/LevelIndicator.java @@ -243,7 +243,7 @@ public int getPeakMarkSize() { } /** - * Sets the current value of the inidicator + * Sets the current value of the indicator * @param value The current value */ public void setValue(long value) { diff --git a/visualvm/coredump/src/org/graalvm/visualvm/coredump/impl/AddVMCoredumpAction.java b/visualvm/coredump/src/org/graalvm/visualvm/coredump/impl/AddVMCoredumpAction.java index bff337c0c4..7cf35cfc6a 100644 --- a/visualvm/coredump/src/org/graalvm/visualvm/coredump/impl/AddVMCoredumpAction.java +++ b/visualvm/coredump/src/org/graalvm/visualvm/coredump/impl/AddVMCoredumpAction.java @@ -65,7 +65,7 @@ public static synchronized AddVMCoredumpAction selectionAware() { return selectionAware; } - public void actionPerformed(CoreDumpsContainer contanier, ActionEvent e) { + public void actionPerformed(CoreDumpsContainer container, ActionEvent e) { CoreDumpConfigurator newCoreDumpConfiguration = CoreDumpConfigurator.defineCoreDump(); if (newCoreDumpConfiguration != null) { CoreDumpProvider.createCoreDump(newCoreDumpConfiguration.getCoreDumpFile(), @@ -75,7 +75,7 @@ public void actionPerformed(CoreDumpsContainer contanier, ActionEvent e) { } - protected boolean isEnabled(CoreDumpsContainer contanier) { + protected boolean isEnabled(CoreDumpsContainer container) { return true; } diff --git a/visualvm/graalvm/src/org/graalvm/visualvm/graalvm/libgraal/MemoryModel.java b/visualvm/graalvm/src/org/graalvm/visualvm/graalvm/libgraal/MemoryModel.java index 3516f83b47..7844413e26 100644 --- a/visualvm/graalvm/src/org/graalvm/visualvm/graalvm/libgraal/MemoryModel.java +++ b/visualvm/graalvm/src/org/graalvm/visualvm/graalvm/libgraal/MemoryModel.java @@ -389,7 +389,7 @@ private static MBeanServerConnection getConnection(Application app) { return null; } - static boolean isInStapshot(ApplicationSnapshot snapshot) { + static boolean isInSnapshot(ApplicationSnapshot snapshot) { String version = getProperty(snapshot.getStorage(), SNAPSHOT_VERSION); return version != null; diff --git a/visualvm/graalvm/src/org/graalvm/visualvm/graalvm/libgraal/MemorySnapshotViewPluginProvider.java b/visualvm/graalvm/src/org/graalvm/visualvm/graalvm/libgraal/MemorySnapshotViewPluginProvider.java index a6b8917c5b..2096c3bf05 100644 --- a/visualvm/graalvm/src/org/graalvm/visualvm/graalvm/libgraal/MemorySnapshotViewPluginProvider.java +++ b/visualvm/graalvm/src/org/graalvm/visualvm/graalvm/libgraal/MemorySnapshotViewPluginProvider.java @@ -40,7 +40,7 @@ protected DataSourceViewPlugin createPlugin(ApplicationSnapshot snapshot) { } protected boolean supportsPluginFor(ApplicationSnapshot snapshot) { - return MemoryModel.isInStapshot(snapshot); + return MemoryModel.isInSnapshot(snapshot); } private MemorySnapshotViewPluginProvider() { diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleFrame.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleFrame.java index 5171dde327..c256b22118 100644 --- a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleFrame.java +++ b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleFrame.java @@ -175,7 +175,7 @@ private void createLocals(Instance truffleFrame, List locals, List slots, int size) { return names; } - private Type getVauleType(Instance frameSlot) { + private Type getValueType(Instance frameSlot) { Instance kind = (Instance) frameSlot.getValueOfField("kind"); // NOI18N byte tag = ((Byte) kind.getValueOfField("tag")).byteValue(); // NOI18N diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedReferences.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedReferences.java index 2edc7d213a..080a76226b 100644 --- a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedReferences.java +++ b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedReferences.java @@ -112,19 +112,19 @@ protected HeapViewerNode[] getNodes(HeapViewerNode parent, String viewID, HeapVi O object = objectsI.next(); progress.step(); Collection references = getReferences(object); - Set referers = new HashSet(); + Set referrers = new HashSet(); if (references.isEmpty()) { - referers.add(null); + referrers.add(null); } else for (FieldValue reference : references) { if (refFV == null) refFV = reference; if (!filtersReferences || includeReference(reference)) - referers.add(reference.getDefiningInstance()); + referrers.add(reference.getDefiningInstance()); } - for (Instance referer : referers) { - long refererID = referer == null ? -1 : referer.getInstanceId(); - Integer count = values.get(refererID); + for (Instance referrer : referrers) { + long referrerID = referrer == null ? -1 : referrer.getInstanceId(); + Integer count = values.get(referrerID); if (count == null) count = 0; - values.put(refererID, ++count); + values.put(referrerID, ++count); } } if (Thread.currentThread().isInterrupted()) throw new InterruptedException(); @@ -144,8 +144,8 @@ protected boolean sorts(DataType dataType) { return true; } protected HeapViewerNode createNode(final Map.Entry node) { - long refererID = node.getKey(); - final Instance instance = refererID == -1 ? null : heap.getInstanceByID(refererID); + long referrerID = node.getKey(); + final Instance instance = referrerID == -1 ? null : heap.getInstanceByID(referrerID); HeapViewerNode ref; if (instance == null) { ref = new InstanceNode.IncludingNull(null); @@ -210,7 +210,7 @@ protected HeapViewerNode createNode(O object) { return createObjectNode(object); } protected ProgressIterator objectsIterator(int index, Progress _progress) { - final Instance referer = getInstance(); + final Instance referrer = getInstance(); progress.setupUnknownSteps(); Iterator referencesIt = new ExcludingIterator(new InterruptibleIterator(TruffleObjectMergedReferences.this.objectsIterator())) { @Override @@ -218,9 +218,9 @@ protected boolean exclude(O object) { progress.step(); try { Collection references = getReferences(object); - if (referer == null) return !references.isEmpty(); + if (referrer == null) return !references.isEmpty(); for (FieldValue reference : references) { - if (referer.equals(reference.getDefiningInstance())) + if (referrer.equals(reference.getDefiningInstance())) return false; } } catch (InterruptedException e) {} diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/dynamicobject/DynamicObject.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/dynamicobject/DynamicObject.java index 48c857838e..d7987b78c8 100644 --- a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/dynamicobject/DynamicObject.java +++ b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/dynamicobject/DynamicObject.java @@ -429,7 +429,7 @@ private static boolean isLocationObjSubClass(Instance dynObj) { return isSubClassOf(dynObj, LOCATION_FQN); } - private static boolean isEterpriseFieldLocationObjSubClass(Instance dynObj) { + private static boolean isEnterpriseFieldLocationObjSubClass(Instance dynObj) { return isSubClassOf(dynObj, ENTERPRISE_FIELD_LOCATION_FQN); } @@ -668,10 +668,10 @@ public String getValue() { private FieldValue getEnterpriseValue(Instance loc, String className, Instance dynamicObject) { if (className.length()-ENTERPRISE_PACKAGE.length() < 5) { // obfuscated enterprise classes - return getObfuscatedEnperpriseValue(loc, className, dynamicObject); + return getObfuscatedEnterpriseValue(loc, className, dynamicObject); } if (className.length()-ENTERPRISE_LOCATION_TOP_CLASS.length() < 4) { // obfuscated enterprise inner classes - return getObfuscatedEnperpriseValue(loc, className, dynamicObject); + return getObfuscatedEnterpriseValue(loc, className, dynamicObject); } if (className.endsWith("Decorator")) { // NOI18N Instance actualLoc = (Instance) loc.getValueOfField("actualLocation"); // NOI18N @@ -747,7 +747,7 @@ private ObjectArrayInstance getEnterpriseObjectStore(Instance dynamicObject) { return (ObjectArrayInstance) dynamicObject.getValueOfField(fieldName); } - private FieldValue getObfuscatedEnperpriseValue(Instance loc, String className, Instance dynamicObject) { + private FieldValue getObfuscatedEnterpriseValue(Instance loc, String className, Instance dynamicObject) { List fields = loc.getFieldValues(); if (fields.size() == 2) { @@ -782,7 +782,7 @@ private FieldValue getObfuscatedEnperpriseValue(Instance loc, String className, return getObfuscatedEnterpriseFieldLocation(dynamicObject, loc, index, type, allowInt); } - if (isEterpriseFieldLocationObjSubClass(loc) && loc.getValueOfField("offset") != null) { // NOI18N + if (isEnterpriseFieldLocationObjSubClass(loc) && loc.getValueOfField("offset") != null) { // NOI18N Integer locIndex = null; Instance locType = null; Boolean locAllowInt = null; diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/dynamicobject/DynamicObjectDetailsProvider.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/dynamicobject/DynamicObjectDetailsProvider.java index f46f564866..d06a14aba8 100644 --- a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/dynamicobject/DynamicObjectDetailsProvider.java +++ b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/dynamicobject/DynamicObjectDetailsProvider.java @@ -44,12 +44,12 @@ public class DynamicObjectDetailsProvider extends DetailsProvider.Basic { private static final String SHAPE_MASK = "com.oracle.truffle.api.object.Shape+"; // NOI18N private static final String JS_UNDEFIED_CLASS_FQN = "com.oracle.truffle.js.runtime.objects.Undefined"; // NOI18N private static final String JS_NULL_CLASS_FQN = "com.oracle.truffle.js.runtime.objects.Null"; // NOI18N - private Map jsUndefidedId; + private Map jsUndefinedId; private Map jsNullId; public DynamicObjectDetailsProvider() { super(DYNAMIC_OBJECT_MASK,SHAPE_MASK); - jsUndefidedId = new WeakHashMap(); + jsUndefinedId = new WeakHashMap(); jsNullId = new WeakHashMap(); } @@ -97,7 +97,7 @@ private static String getSimpleClassName(Instance instance) { } private Long getJSUdefined(Heap heap) { - return getInstanceId(jsUndefidedId, heap, JS_UNDEFIED_CLASS_FQN); + return getInstanceId(jsUndefinedId, heap, JS_UNDEFIED_CLASS_FQN); } private Long getJSNull(Heap heap) { diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/python/PythonDetailsProvider.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/python/PythonDetailsProvider.java index 6a7c38d723..780e35675d 100644 --- a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/python/PythonDetailsProvider.java +++ b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/python/PythonDetailsProvider.java @@ -160,8 +160,8 @@ public String getDetailsString(String className, Instance instance, Heap heap) { if (value == null) { Instance storageInst = (Instance) instance.getValueOfField("storage"); // NOI18N if (storageInst != null) { - DynamicObject attrubutes = new DynamicObject(storageInst); - FieldValue nameAttr = attrubutes.getFieldValue("__name__"); // NOI18N + DynamicObject attributes = new DynamicObject(storageInst); + FieldValue nameAttr = attributes.getFieldValue("__name__"); // NOI18N if (nameAttr instanceof ObjectFieldValue) { Instance moduleName = ((ObjectFieldValue)nameAttr).getInstance(); return DetailsSupport.getDetailsString(moduleName, heap); diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RObject.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RObject.java index 15f636dc0f..79b61dfc2d 100644 --- a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RObject.java +++ b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RObject.java @@ -63,7 +63,7 @@ class RObject extends TruffleObject.InstanceBased { private static final String RCOMPLEX_VECTOR_FQN = "com.oracle.truffle.r.runtime.data.RComplexVector"; // NOI18N private static final String RPAIR_LIST_FQN = "com.oracle.truffle.r.runtime.data.RPairList"; // NOI18N private static final String RNULL_FQN = "com.oracle.truffle.r.runtime.data.RNull"; // NOI18N - private static final String[] typeMaping = new String[] { + private static final String[] typeMapping = new String[] { "RRawVector", "raw", // NOI18N "RRaw", "raw", // NOI18N "RLogicalVector", "logical", // NOI18N @@ -99,8 +99,8 @@ class RObject extends TruffleObject.InstanceBased { static { typeMap = new HashMap(); - for (int i=0; i references = instance.getReferences(); - Set referers = new HashSet(); + Set referrers = new HashSet(); if (references.isEmpty()) { - referers.add(null); + referrers.add(null); } else for (Value reference : references) { - referers.add(logicalReferer(reference.getDefiningInstance())); + referrers.add(logicalReferrer(reference.getDefiningInstance())); } - for (Instance referer : referers) { - long refererID = referer == null ? -1 : referer.getInstanceId(); - Integer count = values.get(refererID); + for (Instance referrer : referrers) { + long referrerID = referrer == null ? -1 : referrer.getInstanceId(); + Integer count = values.get(referrerID); if (count == null) count = 0; - values.put(refererID, ++count); + values.put(referrerID, ++count); } } if (Thread.currentThread().isInterrupted()) throw new InterruptedException(); @@ -358,8 +358,8 @@ protected boolean sorts(DataType dataType) { return true; } protected HeapViewerNode createNode(final Map.Entry node) { - long refererID = node.getKey(); - return new ReferenceNode(refererID == -1 ? null : heap.getInstanceByID(refererID)) { + long referrerID = node.getKey(); + return new ReferenceNode(referrerID == -1 ? null : heap.getInstanceByID(referrerID)) { @Override int getCount() { return node.getValue(); } @Override @@ -445,7 +445,7 @@ protected boolean sorts(DataType dataType) { protected HeapViewerNode createNode(Instance object) { return new ReferredInstanceNode(object) { @Override - Instance getReferer() { return ReferenceNode.this.getInstance(); } + Instance getReferrer() { return ReferenceNode.this.getInstance(); } }; } protected ProgressIterator objectsIterator(int index, final Progress _progress) { @@ -458,7 +458,7 @@ protected boolean exclude(Instance instance) { List references = instance.getReferences(); if (_instance == null) return !references.isEmpty(); for (Value reference : references) - if (_instance.equals(logicalReferer(reference.getDefiningInstance()))) + if (_instance.equals(logicalReferrer(reference.getDefiningInstance()))) return false; return true; } @@ -531,18 +531,18 @@ private abstract class ReferredInstanceNode extends InstanceNode { super(instance); } - abstract Instance getReferer(); + abstract Instance getReferrer(); protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapViewerNodeFilter viewFilter, List dataTypes, List sortOrders, Progress progress) throws InterruptedException { HeapOperations.initializeReferences(heap); - Instance referer = getReferer(); - if (referer == null) return HeapViewerNode.NO_NODES; + Instance referrer = getReferrer(); + if (referrer == null) return HeapViewerNode.NO_NODES; final List references = getInstance().getReferences(); Iterator referencesI = references.iterator(); while (referencesI.hasNext()) - if (!referer.equals(logicalReferer(referencesI.next().getDefiningInstance()))) + if (!referrer.equals(logicalReferrer(referencesI.next().getDefiningInstance()))) referencesI.remove(); NodesComputer computer = new NodesComputer(references.size(), UIThresholds.MAX_MERGED_OBJECTS) { @@ -571,7 +571,7 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx } public boolean isLeaf() { - return getReferer() == null; + return getReferrer() == null; } } @@ -582,25 +582,25 @@ public boolean isLeaf() { "java.util.WeakHashMap$Entry" // NOI18N })); - private Instance logicalReferer(Instance realReferer) { - if (realReferer == null) return null; - return isLogicalReferences() ? logicalRefererImpl(realReferer) : realReferer; + private Instance logicalReferrer(Instance realReferrer) { + if (realReferrer == null) return null; + return isLogicalReferences() ? logicalReferrerImpl(realReferrer) : realReferrer; } - private Instance logicalRefererImpl(Instance realReferer) { - JavaClass jclass = realReferer.getJavaClass(); + private Instance logicalReferrerImpl(Instance realReferrer) { + JavaClass jclass = realReferrer.getJavaClass(); if (jclass.isArray()) { - Value reference = getDirectReferrer(realReferer); - if (reference != null) return logicalRefererImpl(reference.getDefiningInstance()); + Value reference = getDirectReferrer(realReferrer); + if (reference != null) return logicalReferrerImpl(reference.getDefiningInstance()); } if (COLLAPSED_ITEMS.contains(jclass.getName())) { - Value reference = getDirectReferrer(realReferer); - if (reference != null) return logicalRefererImpl(reference.getDefiningInstance()); + Value reference = getDirectReferrer(realReferrer); + if (reference != null) return logicalReferrerImpl(reference.getDefiningInstance()); } - return realReferer; + return realReferrer; } private static Value getDirectReferrer(Instance instance) { diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HeapViewerComponent.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HeapViewerComponent.java index 127e87b2db..ac10f4b117 100644 --- a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HeapViewerComponent.java +++ b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HeapViewerComponent.java @@ -440,7 +440,7 @@ private void displayPopupImpl(final JComponent invoker) { final boolean[] skipChange = new boolean[1]; int topl = 8; - int labl = 8; + int label = 8; final int left = scopes ? 12 : 4; int y = 0; GridBagConstraints c; @@ -493,7 +493,7 @@ protected void fireActionPerformed(ActionEvent e) { c = new GridBagConstraints(); c.gridx = 0; c.gridy = y++; - c.insets = new Insets(5, labl, 5, 5); + c.insets = new Insets(5, label, 5, 5); c.fill = GridBagConstraints.HORIZONTAL; popup.add(scopeL, c); @@ -528,7 +528,7 @@ protected void fireItemStateChanged(ItemEvent event) { c = new GridBagConstraints(); c.gridx = 0; c.gridy = y++; - c.insets = new Insets(topl, labl, 5, 5); + c.insets = new Insets(topl, label, 5, 5); c.fill = GridBagConstraints.HORIZONTAL; popup.add(viewL, c); diff --git a/visualvm/host/src/org/graalvm/visualvm/host/HostsSupport.java b/visualvm/host/src/org/graalvm/visualvm/host/HostsSupport.java index 65eea40f6e..4addca94db 100644 --- a/visualvm/host/src/org/graalvm/visualvm/host/HostsSupport.java +++ b/visualvm/host/src/org/graalvm/visualvm/host/HostsSupport.java @@ -103,7 +103,7 @@ Host createHost(HostProperties properties, boolean createOnly, boolean interacti /** * Returns already known Host instance with the same InetAddress or null. * - * @param inetAddress InetAddess to search. + * @param inetAddress InetAddress to search. * @return already known Host instance with the same InetAddress or null. */ public Host getHostByAddress(InetAddress inetAddress) { diff --git a/visualvm/host/src/org/graalvm/visualvm/host/impl/Bundle.properties b/visualvm/host/src/org/graalvm/visualvm/host/impl/Bundle.properties index e61a270fd5..65e4a8083c 100644 --- a/visualvm/host/src/org/graalvm/visualvm/host/impl/Bundle.properties +++ b/visualvm/host/src/org/graalvm/visualvm/host/impl/Bundle.properties @@ -28,7 +28,7 @@ LBL_Host_name=&Host name\: LBL_Display_name=&Display name\: -BTN_AdavancedSettings=&Advanced Settings +BTN_AdvancedSettings=&Advanced Settings LBL_OK=OK diff --git a/visualvm/host/src/org/graalvm/visualvm/host/impl/HostCustomizer.java b/visualvm/host/src/org/graalvm/visualvm/host/impl/HostCustomizer.java index b01c3cb105..b9f74a9497 100644 --- a/visualvm/host/src/org/graalvm/visualvm/host/impl/HostCustomizer.java +++ b/visualvm/host/src/org/graalvm/visualvm/host/impl/HostCustomizer.java @@ -295,7 +295,7 @@ protected void fireActionPerformed(ActionEvent e) { } }; Mnemonics.setLocalizedText(settingsButton, NbBundle.getMessage( - HostCustomizer.class, "BTN_AdavancedSettings")); // NOI18N + HostCustomizer.class, "BTN_AdvancedSettings")); // NOI18N // UI tweaks displaynameCheckbox.setBorder(hostnameLabel.getBorder()); diff --git a/visualvm/host/src/org/graalvm/visualvm/host/model/HostOverview.java b/visualvm/host/src/org/graalvm/visualvm/host/model/HostOverview.java index edad253f98..5952f2d921 100644 --- a/visualvm/host/src/org/graalvm/visualvm/host/model/HostOverview.java +++ b/visualvm/host/src/org/graalvm/visualvm/host/model/HostOverview.java @@ -142,9 +142,9 @@ public abstract class HostOverview extends Model { public abstract String getPatchLevel(); /** - * Returns the textual represenation of the IP address of this host. + * Returns the textual representation of the IP address of this host. * - * @return the textual represenation of the IP address + * @return the textual representation of the IP address */ public abstract String getHostAddress(); diff --git a/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/DisplayableSupport.java b/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/DisplayableSupport.java index 4c16f9bd47..ea7b8164ca 100644 --- a/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/DisplayableSupport.java +++ b/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/DisplayableSupport.java @@ -68,7 +68,7 @@ final class DisplayableSupport { new TimestampFormatProcessor(), new TimespanFormatProcessor(), new MemoryAddressFormatProcessor(), - new FrequencyFormatProcessor(), // must be before DataAmoutFormatProcessor! + new FrequencyFormatProcessor(), // must be before DataAmountFormatProcessor! new PercentFormatProcessor(), new DataAmountFormatProcessor(), // must be the last item! }; diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/impl/AddJFRSnapshotAction.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/impl/AddJFRSnapshotAction.java index 33042ecea0..4a20327e94 100644 --- a/visualvm/jfr/src/org/graalvm/visualvm/jfr/impl/AddJFRSnapshotAction.java +++ b/visualvm/jfr/src/org/graalvm/visualvm/jfr/impl/AddJFRSnapshotAction.java @@ -65,7 +65,7 @@ public static synchronized AddJFRSnapshotAction selectionAware() { return selectionAware; } - public void actionPerformed(JFRSnapshotsContainer contanier, ActionEvent e) { + public void actionPerformed(JFRSnapshotsContainer container, ActionEvent e) { JFRSnapshotConfigurator newSnapshotConfiguration = JFRSnapshotConfigurator.defineJFRSnapshot(); if (newSnapshotConfiguration != null) { JFRSnapshotProvider.createJFRSnapshot(newSnapshotConfiguration.getJFRSnapshotFile(), diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/gc/GcViewSupport.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/gc/GcViewSupport.java index 15ba548631..0e348c7c30 100644 --- a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/gc/GcViewSupport.java +++ b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/gc/GcViewSupport.java @@ -662,7 +662,7 @@ public boolean visit(String typeName, JFREvent event) { s.append("Minimum Size:    ").append(Formatters.bytesFormat().format(new Object[] { event.getLong("minSize") })).append(""); // NOI18N s.append("Maximum Size:    ").append(Formatters.bytesFormat().format(new Object[] { event.getLong("maxSize") })).append(""); // NOI18N - s.append("Yount Generation Ratio:    ").append(Formatters.numberFormat().format(event.getLong("newRatio"))).append(""); // NOI18N + s.append("Young Generation Ratio:    ").append(Formatters.numberFormat().format(event.getLong("newRatio"))).append(""); // NOI18N s.append(""); // NOI18N diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/monitor/MonitorViewSupport.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/monitor/MonitorViewSupport.java index 84758743ab..1d3e67353d 100644 --- a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/monitor/MonitorViewSupport.java +++ b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/monitor/MonitorViewSupport.java @@ -307,11 +307,11 @@ public DataViewComponent.DetailsView getDetailsView() { private static final class Heap extends TimeRecord { final long used; - final long commited; + final long committed; Heap(JFREvent event, JFRModel jfrModel) throws JFRPropertyNotAvailableException { super(event, jfrModel); used = event.getLong("heapUsed"); // NOI18N - commited = event.getLong("heapSpace.committedSize"); // NOI18N + committed = event.getLong("heapSpace.committedSize"); // NOI18N } } @@ -349,7 +349,7 @@ public void run() { for (final Heap record : records) { long time = jfrModel.nsToAbsoluteMillis(record.time); if (time <= lastTime) time = lastTime + 1; - chartSupport.addValues(time, new long[] { record.commited, record.used }); + chartSupport.addValues(time, new long[] { record.committed, record.used }); lastTime = time; } @@ -437,11 +437,11 @@ public DataViewComponent.DetailsView getDetailsView() { private static final class PermGen extends TimeRecord { final long used; - final long commited; + final long committed; PermGen(JFREvent event, JFRModel jfrModel) throws JFRPropertyNotAvailableException { super(event, jfrModel); used = event.getLong("objectSpace.used"); // NOI18N - commited = event.getLong("permSpace.committedSize"); // NOI18N + committed = event.getLong("permSpace.committedSize"); // NOI18N } } @@ -480,7 +480,7 @@ public void run() { for (final PermGen record : records) { long time = jfrModel.nsToAbsoluteMillis(record.time); if (time <= lastTime) time = lastTime + 1; - chartSupport.addValues(time, new long[] { record.commited, record.used }); + chartSupport.addValues(time, new long[] { record.committed, record.used }); lastTime = time; } @@ -568,11 +568,11 @@ public DataViewComponent.DetailsView getDetailsView() { private static final class Metaspace extends TimeRecord { final long used; - final long commited; + final long committed; Metaspace(JFREvent event, JFRModel jfrModel) throws JFRPropertyNotAvailableException { super(event, jfrModel); used = event.getLong("metaspace.used"); // NOI18N - commited = event.getLong("metaspace.committed"); // NOI18N + committed = event.getLong("metaspace.committed"); // NOI18N } } @@ -611,7 +611,7 @@ public void run() { for (final Metaspace record : records) { long time = jfrModel.nsToAbsoluteMillis(record.time); if (time <= lastTime) time = lastTime + 1; - chartSupport.addValues(time, new long[] { record.commited, record.used }); + chartSupport.addValues(time, new long[] { record.committed, record.used }); lastTime = time; } diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/sampler/CPUSamplerViewSupport.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/sampler/CPUSamplerViewSupport.java index d88279749e..f590c68af0 100644 --- a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/sampler/CPUSamplerViewSupport.java +++ b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/sampler/CPUSamplerViewSupport.java @@ -186,9 +186,9 @@ private SnapshotCPUView createView(CPUResultsSnapshot snapshot) { } private Map[] getAllThreads(Map> threads) { - Collection> allThreds = threads.values(); + Collection> allThreads = threads.values(); - return allThreds.toArray(new Map[0]); + return allThreads.toArray(new Map[0]); } } diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/threads/ThreadsViewSupport.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/threads/ThreadsViewSupport.java index ee31758f81..2932e900d0 100644 --- a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/threads/ThreadsViewSupport.java +++ b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/threads/ThreadsViewSupport.java @@ -79,7 +79,7 @@ static abstract class MasterViewSupport extends JPanel { private HTMLTextArea area; private HTMLTextArea alertArea; // private JButton threadDumpButton; -// private static final String LIVE_THRADS = NbBundle.getMessage(ThreadsViewSupport.class, "LBL_Live_threads"); // NOI18N +// private static final String LIVE_THREADS = NbBundle.getMessage(ThreadsViewSupport.class, "LBL_Live_threads"); // NOI18N // private static final String DAEMON_THREADS = NbBundle.getMessage(ThreadsViewSupport.class, "LBL_Daemon_threads"); // NOI18N MasterViewSupport(JFRModel model/*, VisualVMThreadsDataManager threadsManager*/) { @@ -192,7 +192,7 @@ public void hierarchyChanged(HierarchyEvent e) { // private void updateThreadsCounts(int liveThreads, int daemonThreads) { // StringBuilder data = new StringBuilder(); // -// data.append("" + LIVE_THRADS + ": " + liveThreads + "
"); // NOI18N +// data.append("" + LIVE_THREADS + ": " + liveThreads + "
"); // NOI18N // data.append("" + DAEMON_THREADS + ": " + daemonThreads + "
"); // NOI18N // // int selStart = area.getSelectionStart(); diff --git a/visualvm/jmx/src/org/graalvm/visualvm/jmx/CredentialsProvider.java b/visualvm/jmx/src/org/graalvm/visualvm/jmx/CredentialsProvider.java index 2850e609f1..3194f28922 100644 --- a/visualvm/jmx/src/org/graalvm/visualvm/jmx/CredentialsProvider.java +++ b/visualvm/jmx/src/org/graalvm/visualvm/jmx/CredentialsProvider.java @@ -65,7 +65,7 @@ static synchronized Persistent persistent() { /** * Returns an unique String identifying the CredentialsProvider. Must be - * overridden to return a different identificator when subclassing the + * overridden to return a different identifier when subclassing the * CredentialsProvider. * * @return unique String identifying the CredentialsProvider diff --git a/visualvm/jmx/src/org/graalvm/visualvm/jmx/EnvironmentProvider.java b/visualvm/jmx/src/org/graalvm/visualvm/jmx/EnvironmentProvider.java index 5e22398f86..6cce5f1dd9 100644 --- a/visualvm/jmx/src/org/graalvm/visualvm/jmx/EnvironmentProvider.java +++ b/visualvm/jmx/src/org/graalvm/visualvm/jmx/EnvironmentProvider.java @@ -59,7 +59,7 @@ public abstract class EnvironmentProvider { /** - * Returns an unique identificator of the provided environment which helps + * Returns an unique identifier of the provided environment which helps * to differentiate JMX connections defined by the same connection string * but having different JMX environments. For example, the CredentialsProvider * returns the username if defined. @@ -68,7 +68,7 @@ public abstract class EnvironmentProvider { * provides the environment for not persistent JMX connection. * * @param storage Storage or null if the JMX connection is not persistent - * @return unique identificator of the provided environment + * @return unique identifier of the provided environment */ public String getEnvironmentId(Storage storage) { return ""; } // NOI18N diff --git a/visualvm/jmx/src/org/graalvm/visualvm/jmx/JmxConnectionCustomizer.java b/visualvm/jmx/src/org/graalvm/visualvm/jmx/JmxConnectionCustomizer.java index 2dd3b0fa1c..6f44cd0b6c 100644 --- a/visualvm/jmx/src/org/graalvm/visualvm/jmx/JmxConnectionCustomizer.java +++ b/visualvm/jmx/src/org/graalvm/visualvm/jmx/JmxConnectionCustomizer.java @@ -104,12 +104,12 @@ public JmxConnectionCustomizer(String customizerName, String customizerDescripti /** * Default implementation of the PropertiesProvider.supportsDataSource method, - * cannot be further overriden. JmxConnectionCustomizer always supports providing + * cannot be further overridden. JmxConnectionCustomizer always supports providing * initial properties for a JMX application being created. Use the providesProperties * method to control whether to provide a properties category for an existing * application or not. * - * @param application Application for which to provide the properites + * @param application Application for which to provide the properties * @return true for null Application, providesProperties(application) result otherwise */ public final boolean supportsDataSource(Application application) { diff --git a/visualvm/jmx/src/org/graalvm/visualvm/jmx/JmxConnectionSupport.java b/visualvm/jmx/src/org/graalvm/visualvm/jmx/JmxConnectionSupport.java index 3cc2b27b95..8ba0e567bb 100644 --- a/visualvm/jmx/src/org/graalvm/visualvm/jmx/JmxConnectionSupport.java +++ b/visualvm/jmx/src/org/graalvm/visualvm/jmx/JmxConnectionSupport.java @@ -29,7 +29,7 @@ /** * Support for customizing JMX connections in VisualVM. An entrypoint for - * registering custom EnvironmentProviders and JmxConectionCustomizers. + * registering custom EnvironmentProviders and JmxConnectionCustomizers. * * @author Jiri Sedlacek */ diff --git a/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/HeapHistogramImpl.java b/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/HeapHistogramImpl.java index 69c0e39737..d56639fee0 100644 --- a/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/HeapHistogramImpl.java +++ b/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/HeapHistogramImpl.java @@ -211,7 +211,7 @@ private String convertJVMName(String jvmName) { className=jvmName.substring(index+2,jvmName.length()-1); break; default: - System.err.println("Uknown name "+jvmName); // NOI18N + System.err.println("Unknown name "+jvmName); // NOI18N className = jvmName; } for (int i=0;i<=index;i++) { diff --git a/visualvm/jvm/src/org/graalvm/visualvm/jvm/JVMImpl.java b/visualvm/jvm/src/org/graalvm/visualvm/jvm/JVMImpl.java index c1e33d6743..c811057891 100644 --- a/visualvm/jvm/src/org/graalvm/visualvm/jvm/JVMImpl.java +++ b/visualvm/jvm/src/org/graalvm/visualvm/jvm/JVMImpl.java @@ -390,9 +390,9 @@ public synchronized void setDumpOnOOMEnabled(boolean enabled) { jmx.setFlagValue(HEAP_DUMP_PATH,application.getStorage().getDirectory().getAbsolutePath()); } } - Boolean oldVlue = isDumpOnOOMEnabled; + Boolean oldValue = isDumpOnOOMEnabled; isDumpOnOOMEnabled = Boolean.valueOf(enabled); - firePropertyChange(PROPERTY_DUMP_OOME_ENABLED,oldVlue,isDumpOnOOMEnabled); + firePropertyChange(PROPERTY_DUMP_OOME_ENABLED,oldValue,isDumpOnOOMEnabled); } public boolean isTakeHeapDumpSupported() { diff --git a/visualvm/jvmstat/src/org/graalvm/visualvm/jvmstat/application/ConnectionsCustomizer.java b/visualvm/jvmstat/src/org/graalvm/visualvm/jvmstat/application/ConnectionsCustomizer.java index 7dfe92f21e..316a68205e 100644 --- a/visualvm/jvmstat/src/org/graalvm/visualvm/jvmstat/application/ConnectionsCustomizer.java +++ b/visualvm/jvmstat/src/org/graalvm/visualvm/jvmstat/application/ConnectionsCustomizer.java @@ -335,12 +335,12 @@ private static class SafeBorder implements Border { SafeBorder(Border impl) { this.impl = impl; } - public void paintBorder(Component cmpnt, Graphics grphcs, int i, int i1, int i2, int i3) { - impl.paintBorder(cmpnt, grphcs, i, i1, i2, i3); + public void paintBorder(Component component, Graphics graphics, int i, int i1, int i2, int i3) { + impl.paintBorder(component, graphics, i, i1, i2, i3); } - public Insets getBorderInsets(Component cmpnt) { - Insets insets = impl.getBorderInsets(cmpnt); + public Insets getBorderInsets(Component component) { + Insets insets = impl.getBorderInsets(component); if (insets == null) insets = new Insets(0, 0, 0, 0); return insets; } diff --git a/visualvm/launcher/windows-src/Makefile b/visualvm/launcher/windows-src/Makefile index f921748d3d..87a42f7fc8 100644 --- a/visualvm/launcher/windows-src/Makefile +++ b/visualvm/launcher/windows-src/Makefile @@ -4,7 +4,7 @@ # clean remove built files from a configuration # clobber remove all built files # all build all configurations -# help print help mesage +# help print help message # # Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and # .help-impl are implemented in nbproject/makefile-impl.mk. diff --git a/visualvm/launcher/windows-src/o.n.bootstrap/nbexecloader.h b/visualvm/launcher/windows-src/o.n.bootstrap/nbexecloader.h index ec76af67e0..346d08df97 100644 --- a/visualvm/launcher/windows-src/o.n.bootstrap/nbexecloader.h +++ b/visualvm/launcher/windows-src/o.n.bootstrap/nbexecloader.h @@ -30,7 +30,7 @@ #define HELP_MSG \ "\ - --console suppress supppress console output\n\ + --console suppress suppress console output\n\ --console new open new console for output\n\ \n" diff --git a/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/canvas/BufferedCanvasComponent.java b/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/canvas/BufferedCanvasComponent.java index 3201c316b8..1e8ca02720 100644 --- a/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/canvas/BufferedCanvasComponent.java +++ b/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/canvas/BufferedCanvasComponent.java @@ -564,7 +564,7 @@ public final void setBorder(Border border) { * Returns the insets (border) dimensions as (0,0,0,0), since borders * are not supported on a JViewport. * - * @return a Rectange of zero dimension and zero origin + * @return a Rectangle of zero dimension and zero origin * @see #setBorder */ public final Insets getInsets() { diff --git a/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/swing/CrossBorderLayout.java b/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/swing/CrossBorderLayout.java index a10f8e163d..1483f06f10 100644 --- a/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/swing/CrossBorderLayout.java +++ b/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/swing/CrossBorderLayout.java @@ -353,7 +353,7 @@ private static Integer[] normalizedConstraints(Integer[] constraints) { int c2 = normalized[2]; if (c0 != NONE && c0 == c2) - throw new IllegalArgumentException("Duplicite constraints: " + // NOI18N + throw new IllegalArgumentException("Duplicate constraints: " + // NOI18N toString(constraints)); if (isCenter(normalized)) { diff --git a/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/xy/synchronous/SynchronousXYChart.java b/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/xy/synchronous/SynchronousXYChart.java index 44df900a45..99a647efce 100644 --- a/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/xy/synchronous/SynchronousXYChart.java +++ b/visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/xy/synchronous/SynchronousXYChart.java @@ -229,7 +229,7 @@ private int[] findLastVisibleR(int[] startIndex, int viewStart, int viewEnd) { } // Use in case of absolute panic, will always work - // Note: doesn't clear cache, indexesCache.clear() must be invoked explicitely + // Note: doesn't clear cache, indexesCache.clear() must be invoked explicitly private void recomputeVisibleBounds() { int timestampsCount = timeline.getTimestampsCount(); if (timestampsCount == 0) { diff --git a/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/Profiler.java b/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/Profiler.java index 1b430e791d..222d74cceb 100644 --- a/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/Profiler.java +++ b/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/Profiler.java @@ -122,7 +122,7 @@ public static synchronized Profiler getDefault() { if (defaultProfiler == null) { throw new InternalError("Should never happen"); // NOI18N } else if (DEBUG) { - System.err.println("Default Profiler succesfully installed: " + defaultProfiler); // NOI18N + System.err.println("Default Profiler successfully installed: " + defaultProfiler); // NOI18N } } return defaultProfiler; diff --git a/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/ProfilingSettings.java b/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/ProfilingSettings.java index 2aab0fc7e2..77ec33d225 100644 --- a/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/ProfilingSettings.java +++ b/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/ProfilingSettings.java @@ -91,7 +91,7 @@ public class ProfilingSettings { public static final String PROP_WORKING_DIR = "profiler.settings.override.working.dir"; //NOI18N public static final String PROP_JVM_ARGS = "profiler.settings.override.jvm.args"; //NOI18N public static final String PROP_JAVA_PLATFORM = "profiler.settings.override.java.platform"; //NOI18N - public static final String PROP_IS_PRESET = "profiler.settigns.ispreset"; // NOI18N + public static final String PROP_IS_PRESET = "profiler.settings.ispreset"; // NOI18N public static final String PROP_SETTINGS_NAME = "profiler.settings.settings.name"; //NOI18N public static final String PROP_PROFILING_TYPE = "profiler.settings.profiling.type"; //NOI18N public static final String PROP_THREADS_MONITORING_ENABLED = "profiler.settings.threads.monitoring.enabled"; //NOI18N @@ -101,7 +101,7 @@ public class ProfilingSettings { public static final String PROP_EXCLUDE_WAIT_TIME = "profiler.settings.cpu.exclude.wait.time"; // NOI18N public static final String PROP_INSTR_SCHEME = "profiler.settings.instr.scheme"; //NOI18N public static final String PROP_THREAD_CPU_TIMER_ON = "profiler.settings.thread.cpu.timer.on"; //NOI18N - public static final String PROP_INSTRUMENT_GETTER_SETTER_METHODS = "profiler.settings.istrument.getter.setter.methods"; //NOI18N + public static final String PROP_INSTRUMENT_GETTER_SETTER_METHODS = "profiler.settings.instrument.getter.setter.methods"; //NOI18N public static final String PROP_INSTRUMENT_EMPTY_METHODS = "profiler.settings.instrument.empty.methods"; //NOI18N public static final String PROP_INSTRUMENT_METHOD_INVOKE = "profiler.settings.instrument.method.invoke"; //NOI18N public static final String PROP_INSTRUMENT_SPAWNED_THREADS = "profiler.settings.instrument.spawned.threads"; //NOI18N @@ -110,9 +110,9 @@ public class ProfilingSettings { public static final String PROP_SORT_RESULTS_BY_THREAD_CPU_TIME = "profiler.settings.sort.results.by.thread.cpu.time"; //NOI18N public static final String PROP_SAMPLING_INTERVAL = "profiler.settings.sampling.interval"; //NOI18N public static final String PROP_INSTRUMENTATION_ROOT_METHODS_SIZE = "profiler.settings.instrumentation.root.methods.size"; //NOI18N - public static final String PROP_INSTRUMENTATION_ROOT_METHODS_PREFIX = "profiler.settings.istrumentation.root.methods-"; //NOI18N + public static final String PROP_INSTRUMENTATION_ROOT_METHODS_PREFIX = "profiler.settings.instrumentation.root.methods-"; //NOI18N public static final String PROP_INSTRUMENTATION_MARKER_METHODS_SIZE = "profiler.settings.instrumentation.marker.methods.size"; //NOI18N - public static final String PROP_INSTRUMENTATION_MARKER_METHODS_PREFIX = "profiler.settings.istrumentation.marker.methods-"; //NOI18N + public static final String PROP_INSTRUMENTATION_MARKER_METHODS_PREFIX = "profiler.settings.instrumentation.marker.methods-"; //NOI18N public static final String PROP_FRAGMENT_SELECTION = "profiler.settings.fragment.selection"; //NOI18N public static final String PROP_CODE_REGION_CPU_RES_BUF_SIZE = "profiler.settings.code.region.cpu.res.buf.size"; //NOI18N public static final String PROP_RUN_GC_ON_GET_RESULTS_IN_MEMORY_PROFILING = "profiler.settings.run.gc.on.get.results.in.memory.profiling"; //NOI18N diff --git a/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/Bundle.properties b/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/Bundle.properties index 55db5fbf76..044b8690e1 100644 --- a/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/Bundle.properties +++ b/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/Bundle.properties @@ -71,15 +71,15 @@ IntegrationUtils_PlatformMacOs=Mac OS X IntegrationUtils_ModifiedForProfilerString=This file was modified to allow integration with NetBeans Profiler # IntegrationUtils_OriginalBackupLocationString is placed into every file modified by the Profiler IntegrationUtils_OriginalBackupLocationString=Backup of original version of this file should be located in the same directory with .backup extension -# Must start by uppercase for languages which support it, will be programatically converted to lowercase for some messages +# Must start by uppercase for languages which support it, will be programmatically converted to lowercase for some messages IntegrationUtils_ApplicationString=Application -# Must start by uppercase for languages which support it, will be programatically converted to lowercase for some messages +# Must start by uppercase for languages which support it, will be programmatically converted to lowercase for some messages IntegrationUtils_AppletString=Applet -# Must start by uppercase for languages which support it, will be programatically converted to lowercase for some messages +# Must start by uppercase for languages which support it, will be programmatically converted to lowercase for some messages IntegrationUtils_ServerString=Server -# Must start by uppercase for languages which support it, will be programatically converted to lowercase for some messages +# Must start by uppercase for languages which support it, will be programmatically converted to lowercase for some messages IntegrationUtils_DatabaseString=Database -# Must start by uppercase for languages which support it, will be programatically converted to lowercase for some messages +# Must start by uppercase for languages which support it, will be programmatically converted to lowercase for some messages IntegrationUtils_TargetString=Target IntegrationUtils_Jdk50Name=Java SE 5 (JRE or JDK) IntegrationUtils_Jdk60Name=Java SE 6 (JRE or JDK) diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/LiveResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/LiveResultsPanel.java index 9f7c1aed34..2839cc34e2 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/LiveResultsPanel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/LiveResultsPanel.java @@ -63,7 +63,7 @@ public interface LiveResultsPanel { /** * Called when auto refresh is on and profiling session will finish - * to give the panel chance to do some cleanup before asynchrounous + * to give the panel chance to do some cleanup before asynchronous * call to updateLiveResults() will happen. * * Here the context menu should be closed if open, otherwise it diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/UIUtils.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/UIUtils.java index c24c50fda5..ba5d84c216 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/UIUtils.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/UIUtils.java @@ -314,7 +314,7 @@ public static Color getUnfocusedSelectionBackground() { unfocusedSelBg = UIManager.getColor("controlShadow"); //NOI18N if (unfocusedSelBg == null) { - //Okay, the look and feel doesn't suport it, punt + //Okay, the look and feel doesn't support it, punt unfocusedSelBg = Color.lightGray; } @@ -341,7 +341,7 @@ public static Color getUnfocusedSelectionForeground() { unfocusedSelFg = UIManager.getColor("textText"); //NOI18N if (unfocusedSelFg == null) { - //Okay, the look and feel doesn't suport it, punt + //Okay, the look and feel doesn't support it, punt unfocusedSelFg = Color.BLACK; } } diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/charts/BarChart.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/charts/BarChart.java index 37dcba21a5..e7eb39c211 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/charts/BarChart.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/charts/BarChart.java @@ -466,7 +466,7 @@ protected void drawChart(Graphics2D g2) { - vertAxisWidth // width of vertical axis - horizLegendWidth // width of horizontal axis legend - leftOffset // extra left spacing (between vertical axis and first bar) - - rightOffset // extra right spacing (betweel last bar and end of horizontal axis) + - rightOffset // extra right spacing (between last bar and end of horizontal axis) - (barsCount * xSpacing) // spacing between bars + one more before horizontal axis legend - ((horizLegendWidth == 0) ? 0 : 5) // extra space before horizontal axis legend - (outlineStrokeWidth * 2); // effective stroke width diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/AnimatedContainer.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/AnimatedContainer.java index afd9145bd8..04c61148be 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/AnimatedContainer.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/AnimatedContainer.java @@ -48,7 +48,7 @@ /** - * A container for two contents that are animated in traansition between them. + * A container for two contents that are animated in transition between them. * * @author Vlada Nemec */ diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/Animator.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/Animator.java index c1f35db90d..72a6716262 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/Animator.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/Animator.java @@ -56,7 +56,7 @@ public class Animator implements ActionListener { //~ Static fields/initializers ----------------------------------------------------------------------------------------------- private static final int STEPS = 5; - private static final int DURATION = 100; //miliseconds + private static final int DURATION = 100; //milliseconds //~ Instance fields ---------------------------------------------------------------------------------------------------------- diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/FlatToolBar.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/FlatToolBar.java index cb66f3c0b1..8316bd3c29 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/FlatToolBar.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/FlatToolBar.java @@ -137,7 +137,7 @@ public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { g.translate(x, y); if ((model.isPressed() && model.isArmed()) || model.isSelected()) { - // Draw the pressd button + // Draw the pressed button g.setColor(pressed); g.drawRect(0, 0, w - 1, h - 1); } else { @@ -189,7 +189,7 @@ protected void setBorderToRollover(Component c) { //~ Static fields/initializers ----------------------------------------------------------------------------------------------- public static final int BUTTON_STYLE_HORIZONTAL = 1; - public static final int BUTTON_STYLE_VERICAL = 2; + public static final int BUTTON_STYLE_VERTICAL = 2; //~ Instance fields ---------------------------------------------------------------------------------------------------------- @@ -245,7 +245,7 @@ protected void addImpl(Component comp, Object constraints, int index) { ab.setContentAreaFilled(false); ab.setMargin(new Insets(3, 3, 3, 3)); - if (buttonStyle == BUTTON_STYLE_VERICAL) { + if (buttonStyle == BUTTON_STYLE_VERTICAL) { ab.setVerticalTextPosition(SwingConstants.BOTTOM); ab.setHorizontalTextPosition(SwingConstants.CENTER); } @@ -257,7 +257,7 @@ protected void addImpl(Component comp, Object constraints, int index) { protected JButton createActionComponent(Action a) { JButton b = super.createActionComponent(a); - if (buttonStyle == BUTTON_STYLE_VERICAL) { + if (buttonStyle == BUTTON_STYLE_VERTICAL) { b.putClientProperty("hideActionText", Boolean.FALSE); //NOI18N String iconBase = (String) a.getValue("iconBase"); //NOI18N diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedRadioButton.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedRadioButton.java index 7cf4c41fe9..dc42650e1d 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedRadioButton.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedRadioButton.java @@ -64,7 +64,7 @@ public static class DoubleIcon implements Icon { private Icon icon1; private Icon icon2; private int icon1VertOffset = 0; - private int icon2HorzOffset; + private int icon2HorizOffset; private int icon2VertOffset = 0; private int iconHeight; private int iconWidth; @@ -104,7 +104,7 @@ public int getIconsGap() { public void paintIcon(Component c, Graphics g, int x, int y) { icon1.paintIcon(c, g, x, y + icon1VertOffset); - icon2.paintIcon(c, g, x + icon2HorzOffset, y + icon2VertOffset); + icon2.paintIcon(c, g, x + icon2HorizOffset, y + icon2VertOffset); } private void initInternals() { @@ -121,7 +121,7 @@ private void initInternals() { icon1VertOffset = (int) Math.ceil((float) (icon2Height - icon1Height) / (float) 2); } - icon2HorzOffset = icon1Width + iconsGap; + icon2HorizOffset = icon1Width + iconsGap; } } diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedTable.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedTable.java index 4fc307446c..1e53e417bb 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedTable.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedTable.java @@ -183,7 +183,7 @@ public void mouseEntered(MouseEvent e) { } public void mouseExited(MouseEvent e) { - // Return if mouseExit occured because of showing heavyweight celltip + // Return if mouseExit occurred because of showing heavyweight celltip if (contains(e.getPoint()) && cellTip.isShowing()) { return; } diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedTree.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedTree.java index b4992b2c75..638bb65c0c 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedTree.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JExtendedTree.java @@ -87,7 +87,7 @@ public void mouseEntered(MouseEvent e) { public void mouseExited(MouseEvent e) { // --- CellTip support ------------------ - // Return if mouseExit occured because of showing heavyweight celltip + // Return if mouseExit occurred because of showing heavyweight celltip if (contains(e.getPoint()) && cellTip.isShowing()) { return; } diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JTreeTable.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JTreeTable.java index b86195325c..894de056a0 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JTreeTable.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JTreeTable.java @@ -89,7 +89,7 @@ class ListToTreeSelectionModelWrapper extends DefaultTreeSelectionModel { /** * Class responsible for calling updateSelectedPathsFromSelectedRows - * when the selection of the list changse. + * when the selection of the list changes. */ class ListSelectionHandler implements ListSelectionListener { //~ Methods ---------------------------------------------------------------------------------------------------------- @@ -244,7 +244,7 @@ public void mouseMoved(MouseEvent e) { } /* - * Here the active header button is programatically pressed + * Here the active header button is programmatically pressed */ public void mousePressed(MouseEvent e) { if ((e.getModifiers() == InputEvent.BUTTON1_MASK) && (tableHeader.getResizingColumn() == null)) { @@ -254,7 +254,7 @@ public void mousePressed(MouseEvent e) { } /* - * Here the active header button is programatically released + * Here the active header button is programmatically released */ public void mouseReleased(MouseEvent e) { if (e.getModifiers() == InputEvent.BUTTON1_MASK) { @@ -273,7 +273,7 @@ private class TreeTableCellRenderer extends JTree implements TableCellRenderer { private Color unselectedBackground; private Color unselectedForeground; private EnhancedTreeCellRenderer treeCellRenderer; - private int offsetX; // x-offsed used for scrolling the TreeTable cell + private int offsetX; // x-offset used for scrolling the TreeTable cell //~ Constructors --------------------------------------------------------------------------------------------------------- @@ -614,7 +614,7 @@ public JTree getTree() { return tree; } - /** Sets the x-offsed used for scrolling the TreeTable cell */ + /** Sets the x-offset used for scrolling the TreeTable cell */ public void setTreeCellOffsetX(int offsetX) { if (getTreeCellOffsetX() != offsetX) { tree.setOffsetX(offsetX); @@ -622,7 +622,7 @@ public void setTreeCellOffsetX(int offsetX) { } } - /** Gets the x-offsed used for scrolling the TreeTable cell */ + /** Gets the x-offset used for scrolling the TreeTable cell */ public int getTreeCellOffsetX() { return tree.getOffsetX(); } @@ -740,7 +740,7 @@ public void mouseExited(MouseEvent e) { //dispatchMouseEvent(e); // --- CellTip support ------------------ - // Return if mouseExit occured because of showing heavyweight celltip + // Return if mouseExit occurred because of showing heavyweight celltip if (contains(e.getPoint()) && cellTip.isShowing()) { return; } @@ -966,7 +966,7 @@ public void updateTreeTableHeader() { /** * Overridden to message super and forward the method to the tree. Since - * the tree is not actually in the component hieachy it will never receive + * the tree is not actually in the component hierarchy it will never receive * this unless we forward it in this manner. */ public void updateUI() { diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/CustomSortableHeaderRenderer.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/CustomSortableHeaderRenderer.java index 011ba4c296..fe62978de5 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/CustomSortableHeaderRenderer.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/CustomSortableHeaderRenderer.java @@ -62,7 +62,7 @@ public class CustomSortableHeaderRenderer implements TableCellRenderer { /** * The column which is currently being pressed. - * The button has to be pressed programatically because the mouse events are not delivered to the JButton from the table header. + * The button has to be pressed programmatically because the mouse events are not delivered to the JButton from the table header. */ private int pressedColumn = -1; diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/EnhancedTableCellRenderer.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/EnhancedTableCellRenderer.java index dc2a224b4a..0380517217 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/EnhancedTableCellRenderer.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/EnhancedTableCellRenderer.java @@ -50,7 +50,7 @@ /** An abstract superclass for table cell renderers to be used throughout the profiler. - * It implements alrenating background colors for odd and even rows, and simplifies the writing of + * It implements alternating background colors for odd and even rows, and simplifies the writing of * concrete renderers by masking Swing's ugly CellRenderer API (by forcing "this" to be returned as the renderer). * * @author Ian Formanek diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/SortableTableModel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/SortableTableModel.java index 4f456793ca..fbc3f4fd98 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/SortableTableModel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/SortableTableModel.java @@ -112,7 +112,7 @@ public void mouseMoved(MouseEvent e) { } /* - * Here the active header button is programatically pressed + * Here the active header button is programmatically pressed */ public void mousePressed(MouseEvent e) { if ((e.getModifiers() == InputEvent.BUTTON1_MASK) && (tableHeader.getResizingColumn() == null)) { @@ -122,7 +122,7 @@ public void mousePressed(MouseEvent e) { } /* - * Here the active header button is programatically released + * Here the active header button is programmatically released */ public void mouseReleased(MouseEvent e) { if (e.getModifiers() == InputEvent.BUTTON1_MASK) { diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/treetable/TreeTableModel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/treetable/TreeTableModel.java index 63105ce098..49886d49c7 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/treetable/TreeTableModel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/treetable/TreeTableModel.java @@ -61,7 +61,7 @@ public interface TreeTableModel extends TreeModel { public Class getColumnClass(int column); /** - * Returns the number ofs availible column. + * Returns the number ofs available column. */ public int getColumnCount(); diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/CodeRegionLivePanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/CodeRegionLivePanel.java index e44326916b..62e78481e2 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/CodeRegionLivePanel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/CodeRegionLivePanel.java @@ -128,11 +128,11 @@ public void handleRemove() { /** * Called when auto refresh is on and profiling session will finish - * to give the panel chance to do some cleanup before asynchrounous + * to give the panel chance to do some cleanup before asynchronous * call to updateLiveResults() will happen. */ public void handleShutdown() { - // Nothing to do for Code Region live results, updateLiveResults will be called explicitely from outside + // Nothing to do for Code Region live results, updateLiveResults will be called explicitly from outside } // --- Save current View action support -------------------------------------- diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/LiveFlatProfileCollectorPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/LiveFlatProfileCollectorPanel.java index 8545d4e3d8..dfe5b1216f 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/LiveFlatProfileCollectorPanel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/LiveFlatProfileCollectorPanel.java @@ -138,7 +138,7 @@ public void handleRemove() { /** * Called when auto refresh is on and profiling session will finish - * to give the panel chance to do some cleanup before asynchrounous + * to give the panel chance to do some cleanup before asynchronous * call to updateLiveResults() will happen. * * Currently it closes the context menu if open, which would otherwise @@ -147,7 +147,7 @@ public void handleRemove() { public void handleShutdown() { // Profiling session will finish and context menu is opened, this would block last live results update -> menu will be closed if ((popup != null) && popup.isVisible()) { - updateResultsPending = false; // clear the flag, updateLiveResults() will be called explicitely from outside + updateResultsPending = false; // clear the flag, updateLiveResults() will be called explicitly from outside popup.setVisible(false); // close the context menu } } diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/LiveFlatProfilePanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/LiveFlatProfilePanel.java index b906731b25..3de1305d07 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/LiveFlatProfilePanel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/LiveFlatProfilePanel.java @@ -144,7 +144,7 @@ public void handleRemove() { /** * Called when auto refresh is on and profiling session will finish - * to give the panel chance to do some cleanup before asynchrounous + * to give the panel chance to do some cleanup before asynchronous * call to updateLiveResults() will happen. * * Currently it closes the context menu if open, which would otherwise diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/statistics/TimingData.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/statistics/TimingData.java index 74baed6246..704c3f0607 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/statistics/TimingData.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/statistics/TimingData.java @@ -83,7 +83,7 @@ public synchronized long getTime1Acc() { return time1Acc; } - public synchronized void addIncomming(int invocations) { + public synchronized void addIncoming(int invocations) { incInv += invocations; } @@ -99,7 +99,7 @@ public synchronized void addTime1(long time1) { time1Acc += time1; } - public synchronized void incrementIncomming() { + public synchronized void incrementIncoming() { incInv++; } diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/AllocResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/AllocResultsPanel.java index 775d534116..96890c3a75 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/AllocResultsPanel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/AllocResultsPanel.java @@ -467,7 +467,7 @@ public void actionPerformed(ActionEvent e) { // Current sorting column is going to be hidden if ((isColumnVisible) && (column == realSortingColumn)) { // Try to set next column as a sortingColumn. If currentSortingColumn is the last column, set previous - // column asa sorting Column (one column is always visible). + // column as a sorting Column (one column is always visible). sortingColumn = ((sortingColumn + 1) == resTableModel.getColumnCount()) ? (sortingColumn - 1) : (sortingColumn + 1); realSortingColumn = resTableModel.getRealColumn(sortingColumn); diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveAllocResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveAllocResultsPanel.java index 40c9a9ab3e..3266332787 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveAllocResultsPanel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveAllocResultsPanel.java @@ -203,7 +203,7 @@ public void handleRemove() { public void handleShutdown() { // Profiling session will finish and context menu is opened, this would block last live results update -> menu will be closed if ((memoryResPopupMenu != null) && memoryResPopupMenu.isVisible()) { - updateResultsPending = false; // clear the flag, updateLiveResults() will be called explicitely from outside + updateResultsPending = false; // clear the flag, updateLiveResults() will be called explicitly from outside memoryResPopupMenu.setVisible(false); // close the context menu } } @@ -213,8 +213,8 @@ public boolean hasView() { return resTable != null; } - public boolean supports(int instrumentataionType) { - return instrumentataionType == CommonConstants.INSTR_OBJECT_ALLOCATIONS; + public boolean supports(int instrumentationType) { + return instrumentationType == CommonConstants.INSTR_OBJECT_ALLOCATIONS; } public void updateLiveResults() { diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveLivenessResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveLivenessResultsPanel.java index 3efc407066..a7dd7c8788 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveLivenessResultsPanel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveLivenessResultsPanel.java @@ -310,7 +310,7 @@ public void handleRemove() { public void handleShutdown() { // Profiling session will finish and context menu is opened, this would block last live results update -> menu will be closed if ((popup != null) && popup.isVisible()) { - updateResultsPending = false; // clear the flag, updateLiveResults() will be called explicitely from outside + updateResultsPending = false; // clear the flag, updateLiveResults() will be called explicitly from outside popup.setVisible(false); // close the context menu } } diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveSampledResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveSampledResultsPanel.java index 629ca899d2..54354ffc59 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveSampledResultsPanel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveSampledResultsPanel.java @@ -180,7 +180,7 @@ public void handleRemove() { public void handleShutdown() { // Profiling session will finish and context menu is opened, this would block last live results update -> menu will be closed if ((memoryResPopupMenu != null) && memoryResPopupMenu.isVisible()) { - updateResultsPending = false; // clear the flag, updateLiveResults() will be called explicitely from outside + updateResultsPending = false; // clear the flag, updateLiveResults() will be called explicitly from outside memoryResPopupMenu.setVisible(false); // close the context menu } } @@ -190,8 +190,8 @@ public boolean hasView() { return resTable != null; } - public boolean supports(int instrumentataionType) { - return instrumentataionType == CommonConstants.INSTR_NONE_MEMORY_SAMPLING; + public boolean supports(int instrumentationType) { + return instrumentationType == CommonConstants.INSTR_NONE_MEMORY_SAMPLING; } public void updateLiveResults() { diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LivenessResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LivenessResultsPanel.java index 41b3c9813c..fdff78d69f 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LivenessResultsPanel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LivenessResultsPanel.java @@ -553,7 +553,7 @@ protected void initColumnsData() { }; columnToolTips = new String[] { - CLASS_COLUMN_TOOLTIP, // - "+getPercentsTracked()+"% of all allocated objets are displayed\",", + CLASS_COLUMN_TOOLTIP, // - "+getPercentsTracked()+"% of all allocated objects are displayed\",", LIVE_BYTES_REL_COLUMN_TOOLTIP, // - "+getPercentsTracked()+"% Tracked", LIVE_BYTES_COLUMN_TOOLTIP, // - "+getPercentsTracked()+"% Tracked", LIVE_OBJECTS_COLUMN_TOOLTIP, // - "+getPercentsTracked()+"% Tracked", diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/SampledResultsPanel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/SampledResultsPanel.java index 7459af4d7b..5987122635 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/SampledResultsPanel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/SampledResultsPanel.java @@ -465,7 +465,7 @@ public void actionPerformed(ActionEvent e) { // Current sorting column is going to be hidden if ((isColumnVisible) && (column == realSortingColumn)) { // Try to set next column as a sortingColumn. If currentSortingColumn is the last column, set previous - // column asa sorting Column (one column is always visible). + // column as a sorting Column (one column is always visible). sortingColumn = ((sortingColumn + 1) == resTableModel.getColumnCount()) ? (sortingColumn - 1) : (sortingColumn + 1); realSortingColumn = resTableModel.getRealColumn(sortingColumn); diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/monitor/VMTelemetryModels.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/monitor/VMTelemetryModels.java index 50527d67b2..3ee9c56b61 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/monitor/VMTelemetryModels.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/monitor/VMTelemetryModels.java @@ -147,7 +147,7 @@ private SynchronousXYItemsModel createCPUItemsModel(Timeline timeline) { // CPU SynchronousXYItem cpuTimeItem = new SynchronousXYItem("CPU Time", 0, 1000) { public long getYValue(int index) { - return dataManager.processCPUTimeInPromile[index]; + return dataManager.processCPUTimeInProfile[index]; } }; cpuTimeItem.setInitialBounds(new LongRect(0, 0, 0, 1000)); @@ -216,7 +216,7 @@ public long[] getGCStarts(int index) { } public long[] getGCEnds(int index) { - return dataManager.gcFinishs[index]; + return dataManager.gcFinishes[index]; } }; diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerColumnModel.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerColumnModel.java index a9a2120324..54ccfa4dfc 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerColumnModel.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerColumnModel.java @@ -144,7 +144,7 @@ int getColumnOffset(int column) { return offset == null ? 0 : offset.intValue(); } - void clearColumnsPrefferedWidth() { + void clearColumnsPreferredWidth() { if (columnPreferredWidths != null) columnPreferredWidths.clear(); } diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTable.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTable.java index 02dbe90248..9b9fe5b3e5 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTable.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTable.java @@ -128,10 +128,10 @@ private static ResourceBundle BUNDLE() { public static final String PROP_NO_HOVER = "ProfilerTableHover_NoHover"; // NOI18N public ProfilerTable(TableModel model, boolean sortable, - boolean hideableColums, int[] scrollableColumns) { + boolean hideableColumns, int[] scrollableColumns) { super(model); - this.hideableColums = hideableColums; + this.hideableColumns = hideableColumns; setupModels(sortable); setupAppearance(); @@ -780,7 +780,7 @@ static boolean isLeadingAlign(Component component) { // --- Columns hiding & layout --------------------------------------------- - private final boolean hideableColums; + private final boolean hideableColumns; private boolean scrolling; protected void configureEnclosingScrollPane() { @@ -788,7 +788,7 @@ protected void configureEnclosingScrollPane() { JScrollPane scrollPane = getEnclosingScrollPane(); if (scrollPane != null) { - boolean hideable = hideableColums && !UIUtils.isAquaLookAndFeel(); + boolean hideable = hideableColumns && !UIUtils.isAquaLookAndFeel(); final ActionListener chooser = !hideable ? null : new ActionListener() { public void actionPerformed(ActionEvent e) { chooseColumns((Component)e.getSource(), null); @@ -1206,7 +1206,7 @@ public String getToolTipText(MouseEvent e) { return toolTip; } protected void processMouseEvent(MouseEvent e) { - if (hideableColums && UIUtils.isAquaLookAndFeel() && e.isPopupTrigger()) + if (hideableColumns && UIUtils.isAquaLookAndFeel() && e.isPopupTrigger()) chooseColumns((Component)e.getSource(), e.getPoint()); super.processMouseEvent(e.getClickCount() > 1 ? clearClicks(e) : e); } diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTableHover.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTableHover.java index 620ae2aea3..eb5905b26a 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTableHover.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTableHover.java @@ -95,7 +95,7 @@ static void install(ProfilerTable table) { private Popup popup; private Point popupLocation; // topleft popup corner, table coords - private Rectangle popupRect; // visible cell rect, screeen coords + private Rectangle popupRect; // visible cell rect, screen coords private AWT awt; private Mouse mouse; diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTableHovers.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTableHovers.java index 98a20b9f9f..0d0259166b 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTableHovers.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTableHovers.java @@ -374,7 +374,7 @@ private Rectangle getRendererRect(int column, Component renderer) { !table.isScrollableColumn(_column)) return null; - // Do not show value hovers when explicitely disabled + // Do not show value hovers when explicitly disabled if (renderer instanceof JComponent) if (((JComponent)renderer).getClientProperty(ProfilerTable.PROP_NO_HOVER) != null) return null; diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTreeTable.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTreeTable.java index e47d62c377..35f3f7aeb1 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTreeTable.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTreeTable.java @@ -118,8 +118,8 @@ public class ProfilerTreeTable extends ProfilerTable { public ProfilerTreeTable(ProfilerTreeTableModel model, boolean sortable, - boolean hideableColums, int[] scrollableColumns) { - super(new TableModelImpl(model), sortable, hideableColums, scrollableColumns); + boolean hideableColumns, int[] scrollableColumns) { + super(new TableModelImpl(model), sortable, hideableColumns, scrollableColumns); this.model = (TableModelImpl)getModel(); tree = this.model.getTree(); diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/BaseRenderer.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/BaseRenderer.java index 358ec7e69f..51c837f8ea 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/BaseRenderer.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/BaseRenderer.java @@ -271,7 +271,7 @@ protected void firePropertyChange(String propertyName, Object oldValue, Object n private AccessibleContext accessibleContext; - protected AccessibleContext createAccesibleContext() { + protected AccessibleContext createAccessibleContext() { return new JComponent.AccessibleJComponent() { public AccessibleRole getAccessibleRole() { return AccessibleRole.LABEL; @@ -283,7 +283,7 @@ public String getAccessibleName() { } public AccessibleContext getAccessibleContext() { - if (accessibleContext == null) accessibleContext = createAccesibleContext(); + if (accessibleContext == null) accessibleContext = createAccessibleContext(); return accessibleContext; } diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/CheckBoxRenderer.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/CheckBoxRenderer.java index 21a41417f0..eead23e201 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/CheckBoxRenderer.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/CheckBoxRenderer.java @@ -183,7 +183,7 @@ public Insets getInsets(Insets insets) { return this.insets; } - // --- Other peformance tweaks --------------------------------------------- + // --- Other performance tweaks --------------------------------------------- private Color foreground; private Color background; diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/LabelRenderer.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/LabelRenderer.java index 97b695f3d4..743f81f74e 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/LabelRenderer.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/renderer/LabelRenderer.java @@ -301,7 +301,7 @@ public Insets getMargin() { return margin; } - // --- Other peformance tweaks --------------------------------------------- + // --- Other performance tweaks --------------------------------------------- private FontMetrics fontMetrics; private int fontSizeDiff; diff --git a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/threads/ViewManager.java b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/threads/ViewManager.java index 4d466ea0a7..eb6dad74a4 100644 --- a/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/threads/ViewManager.java +++ b/visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/threads/ViewManager.java @@ -376,7 +376,7 @@ private int findLastIndexRight() { while (newIndex < maxIndex && !Position.RIGHT.equals(position)) position = getIndexPosition(++newIndex); - // First invisible inedx or all indexes on right + // First invisible index or all indexes on right if (Position.RIGHT.equals(position)) return newIndex == 0 ? Integer.MAX_VALUE : newIndex - 1; diff --git a/visualvm/libs.profiler/lib.profiler/native/src-jdk15/attach.c b/visualvm/libs.profiler/lib.profiler/native/src-jdk15/attach.c index 4b9f152223..b3708c34e3 100644 --- a/visualvm/libs.profiler/lib.profiler/native/src-jdk15/attach.c +++ b/visualvm/libs.profiler/lib.profiler/native/src-jdk15/attach.c @@ -62,7 +62,7 @@ #define JF_SERVER_JAR_2 "/jfluid-server-15.jar" #endif -// these constatns must match those defined in ProfilerServer +// these constants must match those defined in ProfilerServer #define ATTACH_DYNAMIC 0 #define ATTACH_DIRECT 1 diff --git a/visualvm/libs.profiler/lib.profiler/native/src-jdk15/class_file_cache.c b/visualvm/libs.profiler/lib.profiler/native/src-jdk15/class_file_cache.c index 874fe8b7cb..5b3634699a 100644 --- a/visualvm/libs.profiler/lib.profiler/native/src-jdk15/class_file_cache.c +++ b/visualvm/libs.profiler/lib.profiler/native/src-jdk15/class_file_cache.c @@ -107,7 +107,7 @@ static unsigned char BOGUS_CLASSFILE[] = "HAHA"; void cache_loaded_classes(jvmtiEnv *jvmti_env,jclass *classes,jint class_count) { #ifdef JNI_VERSION_1_6 - //fprintf(stderr,"cache_loade_classes, classes %d\n",(int)class_count); + //fprintf(stderr,"cache_loaded_classes, classes %d\n",(int)class_count); jvmtiError res; //fprintf(stderr,"Retransform called\n"); diff --git a/visualvm/libs.profiler/lib.profiler/native/src-jdk15/common_functions.c b/visualvm/libs.profiler/lib.profiler/native/src-jdk15/common_functions.c index d57e066e8d..3875aa21b7 100644 --- a/visualvm/libs.profiler/lib.profiler/native/src-jdk15/common_functions.c +++ b/visualvm/libs.profiler/lib.profiler/native/src-jdk15/common_functions.c @@ -158,7 +158,7 @@ JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) /* If it looks like the VM was started not from the tool, but on its own, e.g. like java -agentpath:/blahblah/profilerinterface=/foobar/profiler-ea-libs,5140 - do some sanity checks for options and then eable the VM init event, so that we can start + do some sanity checks for options and then enable the VM init event, so that we can start our Java agent when the VM is initialized */ if (options != NULL && strlen(options) > 0) { /* The spec says no options means options == "", but in reality it's NULL */ if (strpbrk(options, ",") == NULL) { diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/ProfilerClient.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/ProfilerClient.java index 1800355e03..ece256b03c 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/ProfilerClient.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/ProfilerClient.java @@ -190,7 +190,7 @@ public void run() { try { startedFlagLock.wait(500); } catch (InterruptedException e) { - startedFlag = -1; // thread has been interrupet = effectively cancelled + startedFlag = -1; // thread has been interrupt = effectively cancelled } } @@ -262,7 +262,7 @@ public void run() { if (currentInstrTypeIsMemoryProfiling()) { savedAllocatedObjectsCountResults = getAllocatedObjectsCountResults(); // #204978: methodIds must be loaded from instead of - // the MemoryCallGraphBuilder'shutdown' method where it is too late + // the MemoryCallGraphBuilder 'shutdown' method where it is too late if (memCctProvider instanceof MemoryCallGraphBuilder) { ((MemoryCallGraphBuilder)memCctProvider).updateInternals(); } @@ -854,7 +854,7 @@ public void deinstrumentMemoryProfiledClasses(boolean[] unprofiledClassStatusArr public void prepareDetachFromTargetJVM() throws ClientUtils.TargetAppOrVMTerminated { while(true) { // active waiting with released lock, this prevents deadlock if getDefiningClassLoaderId is - // called simultanously + // called simultaneously synchronized(this) { sendSimpleCmdToServer(Command.PREPARE_DETACH); Response resp = getAndCheckLastResponse("prepareDetachFromTargetJVM"); @@ -1053,7 +1053,7 @@ public void initiateMemoryProfInstrumentation(int instrType) // load event. However, if the same cmd that we build here is then re-used as commandOnStartup, it should again // contain rootClassName. String[] rootClassNames = new String[]{settings.getMainClassName()}; - commandOnStartup = createInitiateInstrumnetation(instrType, rootClassNames, false, status.startProfilingPointsActive); + commandOnStartup = createInitiateInstrumentation(instrType, rootClassNames, false, status.startProfilingPointsActive); // switch (instrType) { // case INSTR_OBJECT_ALLOCATIONS: @@ -1109,7 +1109,7 @@ public void initiateRecursiveCPUProfInstrumentation(ClientUtils.SourceCodeSelect String[] rootClassNames = instrumentor.getRootClassNames(); int instrType = (settings.getCPUProfilingType() == CPU_INSTR_FULL) ? INSTR_RECURSIVE_FULL : INSTR_RECURSIVE_SAMPLED; - InitiateProfilingCommand cmd = createInitiateInstrumnetation(instrType, rootClassNames, + InitiateProfilingCommand cmd = createInitiateInstrumentation(instrType, rootClassNames, instrSpawnedThreads, status.startProfilingPointsActive); commandOnStartup = cmd; @@ -2024,7 +2024,7 @@ private void readAndProcessProfilingResults(EventBufferDumpedCommand cmd) { // leading to issue 59660: JFluid: error writing collected data to the socket // see http://www.netbeans.org/issues/show_bug.cgi?id=59660 for details if (!status.remoteProfiling && !forceObtainedResultsDumpCalled) { - // Note that the call below may block, waiting for separarateCmdExecThread to finish its current job. + // Note that the call below may block, waiting for separateCmdExecThread to finish its current job. // That means that nothing in readResultsFromBuffer() that this command eventually calls, is allowed to // send a command to the server and await a response. If that happens, the communication thread will be // unavailable for reading server's response (because it's waiting here), effectively causing a deadlock. @@ -2033,7 +2033,7 @@ private void readAndProcessProfilingResults(EventBufferDumpedCommand cmd) { } else { // Process profiling results synchronously in case of: // - remote profiling - // - explicite Get results (forceObtainedResultsDumpCalled) + // - explicit Get results (forceObtainedResultsDumpCalled) byte[] buf = EventBufferProcessor.readDataAndPrepareForProcessing(cmd); EventBufferResultsProvider.getDefault().dataReady(buf, getCurrentInstrType()); handlingEventBufferDump = false; @@ -2128,7 +2128,7 @@ private void sendSimpleRespToServer(boolean val, String errorMessage) { } } - private InitiateProfilingCommand createInitiateInstrumnetation(int instrType, String[] classNames, + private InitiateProfilingCommand createInitiateInstrumentation(int instrType, String[] classNames, boolean instrSpawnedThreads, boolean startProfilingPointsActive) { RuntimeProfilingPoint points[] = settings.getRuntimeProfilingPoints(); String[] profilingPointHandlers = new String[points.length]; diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/ProfilerEngineSettings.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/ProfilerEngineSettings.java index 43e08ab437..89a40ad4d1 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/ProfilerEngineSettings.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/ProfilerEngineSettings.java @@ -497,7 +497,7 @@ public Object clone() { try { clone = (ProfilerEngineSettings) super.clone(); - // clone array of instrumentatio root methods one by one + // clone array of instrumentation root methods one by one clone.instrumentationRootMethods = new ClientUtils.SourceCodeSelection[instrumentationRootMethods.length]; for (int i = 0; i < instrumentationRootMethods.length; i++) { diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/BaseClassInfo.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/BaseClassInfo.java index 49b9b55d83..5b961aaf79 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/BaseClassInfo.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/BaseClassInfo.java @@ -54,7 +54,7 @@ public class BaseClassInfo { //~ Instance fields ---------------------------------------------------------------------------------------------------------- protected String name; - protected String nameAndLoader; // A combinarion of class name and loader, uniquely identifying this ClassInfo + protected String nameAndLoader; // A combination of class name and loader, uniquely identifying this ClassInfo // Management of multiple versions for the same-named (but possibly not same-code) class, loaded by different classloaders protected int classLoaderId; // IDs of all loaders with which versions of this class are loaded diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassFileParser.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassFileParser.java index b731e07cda..41d540a70e 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassFileParser.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassFileParser.java @@ -446,10 +446,10 @@ private void readMethods() { char[] lineNumberTableLengths = new char[methodCount]; int[] localVariableTableOffsets = new int[methodCount]; char[] localVariableTableLengths = new char[methodCount]; - int localVaribaleTableCPindex = 0; + int localVariableTableCPindex = 0; int[] localVariableTypeTableOffsets = new int[methodCount]; char[] localVariableTypeTableLengths = new char[methodCount]; - int localVaribaleTypeTableCPindex = 0; + int localVariableTypeTableCPindex = 0; int[] stackMapTableOffsets = new int[methodCount]; char[] stackMapTableLengths = new char[methodCount]; int stackMapTableCPindex = 0; @@ -494,19 +494,19 @@ private void readMethods() { char tableLen = localVariableTableLengths[i] = nextChar(); localVariableTableOffsets[i] = curBufPos - methodInfoOffsets[i]; curBufPos += LocalVariableTables.ATTR_SIZE * tableLen; - if (localVaribaleTableCPindex == 0) { - localVaribaleTableCPindex = attrNameIdx; + if (localVariableTableCPindex == 0) { + localVariableTableCPindex = attrNameIdx; } else { - assert localVaribaleTableCPindex == attrNameIdx; + assert localVariableTableCPindex == attrNameIdx; } } else if (utf8AtCPIndex(attrNameIdx).equals("LocalVariableTypeTable")){ // NOI18N char tableLen = localVariableTypeTableLengths[i] = nextChar(); localVariableTypeTableOffsets[i] = curBufPos - methodInfoOffsets[i]; curBufPos += LocalVariableTypeTables.ATTR_SIZE * tableLen; - if (localVaribaleTypeTableCPindex == 0) { - localVaribaleTypeTableCPindex = attrNameIdx; + if (localVariableTypeTableCPindex == 0) { + localVariableTypeTableCPindex = attrNameIdx; } else { - assert localVaribaleTypeTableCPindex == attrNameIdx; + assert localVariableTypeTableCPindex == attrNameIdx; } } else if (utf8AtCPIndex(attrNameIdx).equals("StackMapTable")){ // NOI18N char tableLen = stackMapTableLengths[i] = nextChar(); @@ -542,10 +542,10 @@ private void readMethods() { classInfo.lineNumberTablesLengths = lineNumberTableLengths; classInfo.localVariableTablesOffsets = localVariableTableOffsets; classInfo.localVariableTablesLengths = localVariableTableLengths; - classInfo.localVaribaleTableCPindex = localVaribaleTableCPindex; + classInfo.localVariableTableCPindex = localVariableTableCPindex; classInfo.localVariableTypeTablesOffsets = localVariableTypeTableOffsets; classInfo.localVariableTypeTablesLengths = localVariableTypeTableLengths; - classInfo.localVaribaleTypeTableCPindex = localVaribaleTypeTableCPindex; + classInfo.localVariableTypeTableCPindex = localVariableTypeTableCPindex; classInfo.stackMapTablesOffsets = stackMapTableOffsets; classInfo.stackMapTablesLengths = stackMapTableLengths; classInfo.stackMapTableCPindex = stackMapTableCPindex; diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassInfo.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassInfo.java index 53ad97bed1..274af9cc7a 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassInfo.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassInfo.java @@ -84,7 +84,7 @@ public static class LineNumberTables { classBuf = ci.getClassFileBytes(); } catch (IOException ex1) { // Should not happen - class file already loaded once by this time throw new RuntimeException(ex1); - } catch (ClassNotFoundException ex2) { // Dtto + } catch (ClassNotFoundException ex2) { // Ditto throw new RuntimeException(ex2); } @@ -181,7 +181,7 @@ int bciForLineNo(int methodIdx, int lineNo) { if (spcs[i] < bestBCI) { // ..but check first if it's the smallest bci for this line. // The whole issue is due to 'while() { }' effectively compiled as 'do { } while()', where for the actual - // line of the 'while' statementwe get two different bci's in the line number table: + // line of the 'while' statement we get two different bci's in the line number table: // 1. the one for the initial 'goto' that transfers us to the condition check block in the end of the loop body // 2. the first bci of that condition check block. // Whether we hit this line as the first or the last line of our code fragment, the smallest bci is a correct answer. @@ -284,7 +284,7 @@ char[][] getStartPCs() { return startPCs; } - char[][] getLengts() { + char[][] getLengths() { return lengths; } @@ -295,7 +295,7 @@ public boolean hasTable() { public void updateTable(int injectionPos, int injectedBytesCount, int methodIdx) { if (hasTable()) { char[] startPC = getStartPCs()[methodIdx]; - char[] lengths = getLengts()[methodIdx]; + char[] lengths = getLengths()[methodIdx]; if (startPC != null) { for (int i = 0; i < startPC.length; i++) { @@ -315,7 +315,7 @@ public void updateTable(int injectionPos, int injectedBytesCount, int methodIdx) public void writeTable(final byte[] buffer, int locVarTablePtr, int methodIdx) { char[] startPC = getStartPCs()[methodIdx]; - char[] lengths = getLengts()[methodIdx]; + char[] lengths = getLengths()[methodIdx]; if (startPC != null) { for (int i = 0; i < startPC.length; i++, locVarTablePtr+=ATTR_SIZE) { @@ -397,7 +397,7 @@ public void updateTable(int injectionPos, int injectedBytesCount, int methodIdx, offsetAdjusted = true; } } - frame.updateUnitilializedList(injectionPos, injectedBytesCount, changeTypeIsInjectNewInstr, injectionBindsToFollowingInstruction); + frame.updateUninitializedList(injectionPos, injectedBytesCount, changeTypeIsInjectNewInstr, injectionBindsToFollowingInstruction); } } } @@ -600,12 +600,12 @@ private int getVerificationTypeInfoSize(byte type) { // LOG.finer("VerificationTypeInfo: "+(type+0)); switch (type) { case 0: // ITEM_Top - case 1: // ITEM_Integrer + case 1: // ITEM_Integer case 2: // ITEM_Float case 3: // ITEM_Double case 4: // ITEM_Long case 5: // ITEM_Null - case 6: // ITEM_UnitializedThis + case 6: // ITEM_UninitializedThis return 1; case 7: // ITEM_Object case 8: // ITEM_Uninitialized @@ -629,7 +629,7 @@ private void setOffsetDelta(int newOffsetDelta) { modified = true; } - private void updateUnitilializedList(int injectionPos, int injectedBytesCount, boolean changeTypeIsInjectNewInstr, boolean injectionBindsToFollowingInstruction) { + private void updateUninitializedList(int injectionPos, int injectedBytesCount, boolean changeTypeIsInjectNewInstr, boolean injectionBindsToFollowingInstruction) { if (uninitializedList != null) { for (int i = 0; i 0) { ProfilingSessionStatus session = TargetAppRunner.getDefault().getProfilingSessionStatus(); - long statupInCounts = session.startupTimeInCounts; + long startupInCounts = session.startupTimeInCounts; long startupMillis = session.startupTimeMillis; for (int i = 0; i < hiResTimeStamp.length; i++) { - hiResTimeStamp[i] = startupMillis + ((hiResTimeStamp[i] - statupInCounts) / (1000000000 / 1000L)); // 1 ms has 1000000000/1000 ns + hiResTimeStamp[i] = startupMillis + ((hiResTimeStamp[i] - startupInCounts) / (1000000000 / 1000L)); // 1 ms has 1000000000/1000 ns } } } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/CommonConstants.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/CommonConstants.java index b562a8cbe2..7e1a2a7b31 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/CommonConstants.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/CommonConstants.java @@ -250,7 +250,7 @@ public interface CommonConstants { public static final byte THREAD_STATUS_UNKNOWN = -1; // Thread status is unknown. public static final byte THREAD_STATUS_ZOMBIE = 0; // Thread is waiting to die. Also used for "doesn't exist yet" and "dead" public static final byte THREAD_STATUS_RUNNING = 1; // Thread is runnable. Note that we unfortunately don't know whether it' - // s actually running or pre-empted by another thread... + // s actually running or preempted by another thread... public static final byte THREAD_STATUS_SLEEPING = 2; // Thread is sleeping - Thread.sleep() or JVM_Sleep() was called public static final byte THREAD_STATUS_MONITOR = 3; // Thread is waiting on a java monitor public static final byte THREAD_STATUS_WAIT = 4; // Thread is waiting - Object.wait() or JVM_MonitorWait() was called @@ -265,7 +265,7 @@ public interface CommonConstants { public static final java.awt.Color THREAD_STATUS_ZOMBIE_COLOR = null; /** Thread is runnable. Note that we unfortunately don't know whether it's actually running or - * pre-empted by another thread...*/ + * preempted by another thread...*/ public static final java.awt.Color THREAD_STATUS_RUNNING_COLOR = Color.getColor("org.graalvm.visualvm.ThreadColorRunning", new java.awt.Color(58, 228, 103)); // NOI18N /** Thread is sleeping - Thread.sleep() or JVM_Sleep() was called */ diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/Platform.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/Platform.java index 66b6c8f48d..346dc19636 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/Platform.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/Platform.java @@ -158,7 +158,7 @@ public class Platform implements CommonConstants { //~ Methods ------------------------------------------------------------------------------------------------------------------ /** - * Given the name of the directory containing the JFluid native libaries (either just the root JFluid libs dir, + * Given the name of the directory containing the JFluid native libraries (either just the root JFluid libs dir, * or really the full path, depending on fullPathToLibSpecified parameter), return the full platform-dependent * name for the "profilerinterface" library contained in that directory. If non-null jdkString is specified, it * is used in the resulting path; otherwise the VM is queried for its version and the resulting string is used. diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/ProfilingSessionStatus.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/ProfilingSessionStatus.java index 7ed3b1c662..f217d627c1 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/ProfilingSessionStatus.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/ProfilingSessionStatus.java @@ -118,13 +118,13 @@ public class ProfilingSessionStatus { // and thus have thread CPU call graph time always available - but that seems to be too much work for now. public long dumpAbsTimeStamp; - // Target machnine maximum heap size returned by Runtime.maxMemory() + // Target machine maximum heap size returned by Runtime.maxMemory() public long maxHeapSize; - // Target machnine statup time returned by Timers.getCurrentTimeInCounts() + // Target machine startup time returned by Timers.getCurrentTimeInCounts() public long startupTimeInCounts; - // Target machnine startup time returned by System.currentTimeMillis() + // Target machine startup time returned by System.currentTimeMillis() public long startupTimeMillis; private TransactionalSupport transaction = new TransactionalSupport(); private int[] allocatedInstancesCount; diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/TransactionalSupport.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/TransactionalSupport.java index 69a37903fb..2bfffcfb18 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/TransactionalSupport.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/TransactionalSupport.java @@ -208,7 +208,7 @@ private boolean lockShared() { if (counter == null) { lockRead.set(new Integer(1)); - sharedLockCount++; // turn the lock counter only if the current thread doesn't own the sahred lock already + sharedLockCount++; // turn the lock counter only if the current thread doesn't own the shared lock already } else { lockRead.set(new Integer(counter.intValue() + 1)); } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/ClassDumpSegment.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/ClassDumpSegment.java index 0899b5681a..a8aa317c5f 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/ClassDumpSegment.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/ClassDumpSegment.java @@ -65,7 +65,7 @@ class ClassDumpSegment extends TagBounds { //~ Instance fields ---------------------------------------------------------------------------------------------------------- HprofHeap hprofHeap; - Map /**/ arrayMap; + Map /**/ arrayMap; final int classIDOffset; final int classLoaderIDOffset; final int constantPoolSizeOffset; @@ -132,10 +132,10 @@ ClassDump getClassDumpByID(long classObjectID) { if (dump.fileOffset == entry.getOffset()) { return dump; } - } catch (IndexOutOfBoundsException ex) { // classObjectID do not reffer to ClassDump, its instance number is > classes.size() + } catch (IndexOutOfBoundsException ex) { // classObjectID do not refer to ClassDump, its instance number is > classes.size() return null; - } catch (ClassCastException ex) { // classObjectID do not reffer to ClassDump + } catch (ClassCastException ex) { // classObjectID do not refer to ClassDump return null; } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/DominatorTree.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/DominatorTree.java index b1e2efbbdb..150da041b8 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/DominatorTree.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/DominatorTree.java @@ -95,14 +95,14 @@ class DominatorTree { synchronized void computeDominators() { boolean changed = true; - boolean igonoreDirty; + boolean ignoreDirty; try { do { currentMultipleParents.rewind(); - igonoreDirty = !changed; - changed = computeOneLevel(igonoreDirty); + ignoreDirty = !changed; + changed = computeOneLevel(ignoreDirty); switchParents(); - } while (changed || !igonoreDirty); + } while (changed || !ignoreDirty); } catch (IOException ex) { ex.printStackTrace(); } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/HprofHeap.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/HprofHeap.java index 16528b9b47..72e3f20a79 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/HprofHeap.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/HprofHeap.java @@ -1087,7 +1087,7 @@ int readDumpTag(long[] offset) { byte type; if (DEBUG) { - System.out.println("Tag PRIMITINE_ARRAY_DUMP"); // NOI18N + System.out.println("Tag PRIMITIVE_ARRAY_DUMP"); // NOI18N long objId = dumpBuffer.getID(position); position += idSize; diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/NearestGCRoot.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/NearestGCRoot.java index a49f6cdd0f..a63458f5da 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/NearestGCRoot.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/heap/NearestGCRoot.java @@ -68,8 +68,8 @@ class NearestGCRoot { }; private static final String JAVA_LANG_REF_REFERENCE = "java.lang.ref.Reference"; // NOI18N private static final String REFERENT_FILED_NAME = "referent"; // NOI18N - private static final String SVM_REFFERENCE = "com.oracle.svm.core.heap.heapImpl.DiscoverableReference"; // NOI18N - private static final String SVM_REFFERENCE_1 = "com.oracle.svm.core.heap.DiscoverableReference"; // NOI18N + private static final String SVM_REFERENCE = "com.oracle.svm.core.heap.heapImpl.DiscoverableReference"; // NOI18N + private static final String SVM_REFERENCE_1 = "com.oracle.svm.core.heap.DiscoverableReference"; // NOI18N private static final String SVM_REFERENT_FILED_NAME = "rawReferent"; // NOI18N //~ Instance fields ---------------------------------------------------------------------------------------------------------- @@ -162,9 +162,9 @@ private boolean initHotSpotReference() { } private boolean initSVMReference() { - referentFiled = computeReferentFiled(SVM_REFFERENCE, SVM_REFERENT_FILED_NAME); + referentFiled = computeReferentFiled(SVM_REFERENCE, SVM_REFERENT_FILED_NAME); if (referentFiled == null) { - referentFiled = computeReferentFiled(SVM_REFFERENCE_1, SVM_REFERENT_FILED_NAME); + referentFiled = computeReferentFiled(SVM_REFERENCE_1, SVM_REFERENT_FILED_NAME); } if (referentFiled != null) { JavaClass ref = referentFiled.getDeclaringClass(); diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ConstantPoolExtension.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ConstantPoolExtension.java index cb347a717c..80743b5c69 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ConstantPoolExtension.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ConstantPoolExtension.java @@ -89,7 +89,7 @@ public void setIndex2(int idx) { /** * Represents an array of bytes containing constant pool contents to append to the real constant pool, in the unrelocated - * form. Entries in this cpool fragment may point either to other entries within the same cpool fragment (internalIndicies + * form. Entries in this cpool fragment may point either to other entries within the same cpool fragment (internalIndices * array), or to entries in one other cpool fragment (externalIndices array). In either case indices are relative to the * origin of the corresponding cpool fragment. By calling getRelocatedCPoolBytes(intBaseIndex, extBaseIndex), one gets the real * constant pool added contents, with all indices relocated, i.e. pointing at correct absolute locations in the concrete class' diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/Injector.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/Injector.java index 640895f919..786b1cc283 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/Injector.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/Injector.java @@ -58,7 +58,7 @@ * @author Misha Dmitriev * @author Tomas Hurka */ -public abstract class Injector extends SingleMethodScaner { +public abstract class Injector extends SingleMethodScanner { //~ Inner Classes ------------------------------------------------------------------------------------------------------------ //-------------------------------------- Helper classes ------------------------------------------ @@ -286,8 +286,8 @@ protected byte[] createPackedMethodInfo() { ret = insertBytes(ret, insertOffset, stackMapDiff); System.arraycopy(header, 0, ret, stackMapTablePtr-header.length , header.length); System.arraycopy(stackMapData, 0, ret, stackMapTablePtr, stackMapData.length); - int arrtCountPrt = excTableNewStart+2+excTableNewLen; - putU2(ret,arrtCountPrt,getU2(ret,arrtCountPrt)+1); // increment attributes_count item + int attrCountPrt = excTableNewStart+2+excTableNewLen; + putU2(ret,attrCountPrt,getU2(ret,attrCountPrt)+1); // increment attributes_count item } if (stackMapDiff > 0) { putU4(ret, bytecodesStartIdx-12, attrLength + stackMapDiff); // update the attribute_length in Code attribute @@ -414,7 +414,7 @@ private void changeJump(int bci, int offset, boolean isShort, int breakBCI, int // Injection of a completely new instruction and widening of an existing instruction should be handled differently if (changeTypeIsInjectNewInstr) { if (breakBCI == 0) { - return; // No jump to the code injected at offset 0 can be made in the rewrited code + return; // No jump to the code injected at offset 0 can be made in the rewritten code // The most reliable way to verify the correctness of the statements below, is to draw a picture, something like // 1 a // <--- breakBCI = 2 diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/InstrumentationFactory.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/InstrumentationFactory.java index 1f29cebfee..76b3176acc 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/InstrumentationFactory.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/InstrumentationFactory.java @@ -59,7 +59,7 @@ public class InstrumentationFactory implements CommonConstants { //~ Methods ------------------------------------------------------------------------------------------------------------------ - public static byte[] instrumentAsProiflePointHitMethod(DynamicClassInfo clazz, int methodIdx, int injType, + public static byte[] instrumentAsProfilePointHitMethod(DynamicClassInfo clazz, int methodIdx, int injType, RuntimeProfilingPoint[] points) { Injector mi = new ProfilePointHitCallInjector(clazz, clazz.getBaseCPoolCount(injType), methodIdx, points, CPExtensionsRepository.normalContents_ProfilePointHitMethodIdx); diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/Instrumentor.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/Instrumentor.java index 1055ec6775..5c5e9bc926 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/Instrumentor.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/Instrumentor.java @@ -343,7 +343,7 @@ private InstrumentMethodGroupResponse createFollowUpInstrumentMethodGroupRespons // It may happen that if profiling is modified during intensive class loading, some class load message from // server may be already in the pipeline and eventually get here despite the change, and before the relevant - // Method Scaner is initialized. This check should prevent problems caused by this inconsistency. + // Method Scanner is initialized. This check should prevent problems caused by this inconsistency. if (ms == null) { return new InstrumentMethodGroupResponse(null); } @@ -375,7 +375,7 @@ private InstrumentMethodGroupResponse createFollowUpInstrumentMethodGroupRespons ccmd.getThreadInCallGraph()); } else if (cmd instanceof MethodLoadedCommand) { MethodLoadedCommand mcmd = (MethodLoadedCommand) cmd; - //System.out.println("--------- Recieved method load event for " + mcmd.getClassName() + "." + //System.out.println("--------- Received method load event for " + mcmd.getClassName() + "." // + mcmd.getMethodName() + mcmd.getMethodSignature()); ret = ms.getMethodsToInstrumentUponReflectInvoke(mcmd.getClassName(), mcmd.getClassLoaderId(), mcmd.getMethodName(), mcmd.getMethodSignature()); @@ -392,7 +392,7 @@ private InstrumentMethodGroupResponse createFollowUpInstrumentMethodGroupRespons //System.out.println("--------- Received class load event for class " + cmd.getClassName()); // It may happen that if profiling is modified during intensive class loading, some class load message from // server may be already in the pipeline and eventually get here despite the change, and before the relevant - // Method Scaner is initialized. This check should prevent problems caused by this inconsistency. + // Method Scanner is initialized. This check should prevent problems caused by this inconsistency. if (crms == null) { return new InstrumentMethodGroupResponse(null); } @@ -410,7 +410,7 @@ private InstrumentMethodGroupResponse createFollowUpInstrumentMethodGroupRespons //System.out.println("--------- Received class load event for class " + cmd.getClassName()); // It may happen that if profiling is modified during intensive class loading, some class load message from // server may be already in the pipeline and eventually get here despite the change, and before the relevant - // Method Scaner is initialized. This check should prevent problems caused by this inconsistency. + // Method Scanner is initialized. This check should prevent problems caused by this inconsistency. if (oms == null) { return new InstrumentMethodGroupResponse(null); } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MemoryProfMethodInstrumentor.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MemoryProfMethodInstrumentor.java index 80e563dd86..2125c86518 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MemoryProfMethodInstrumentor.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MemoryProfMethodInstrumentor.java @@ -72,10 +72,10 @@ public abstract class MemoryProfMethodInstrumentor extends ClassManager { //~ Inner Classes ------------------------------------------------------------------------------------------------------------ - static class MethodScanerForNewOpcodes extends SingleMethodScaner { + static class MethodScannerForNewOpcodes extends SingleMethodScanner { private final InstrumentationFilter instrFilter; - MethodScanerForNewOpcodes(ClassInfo clazz, int methodIdx, InstrumentationFilter filter) { + MethodScannerForNewOpcodes(ClassInfo clazz, int methodIdx, InstrumentationFilter filter) { super(clazz, methodIdx); instrFilter = filter; } @@ -291,7 +291,7 @@ protected Object[] createInstrumentedMethodPack() { } protected boolean hasNewOpcodes(ClassInfo clazz, int methodIdx, boolean checkForOpcNew, boolean checkForOpcNewArray, InstrumentationFilter instrFilter) { - MethodScanerForNewOpcodes msfno = new MethodScanerForNewOpcodes(clazz, methodIdx, instrFilter); + MethodScannerForNewOpcodes msfno = new MethodScannerForNewOpcodes(clazz, methodIdx, instrFilter); return msfno.hasNewOpcodes(this, checkForOpcNew, checkForOpcNewArray); } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MethodEntryExitCallsInjector.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MethodEntryExitCallsInjector.java index afc342fec5..afd3e40175 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MethodEntryExitCallsInjector.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MethodEntryExitCallsInjector.java @@ -145,7 +145,7 @@ private static void initializeInjectedCode() { // Positions 2, 3 are occupied by methodId injCodeMethodIdPos2 = 2; injCode2[4] = (byte) opc_invokestatic; - // Positions 5, 6 are occpupied by method index for methodExit() + // Positions 5, 6 are occupied by method index for methodExit() injCodeMethodIdxPos2 = 5; injCode2[7] = (byte) opc_aload_1; injCode2[8] = (byte) opc_athrow; diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MiscInstrumentationOps.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MiscInstrumentationOps.java index 4a27314f9b..9cd40a0c96 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MiscInstrumentationOps.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/MiscInstrumentationOps.java @@ -119,7 +119,7 @@ Object[] getOrigCodeForSingleInstrumentedMethod(RootMethods rootMethods) { List classes = ClassRepository.getAllClassVersions(className); if (classes == null) { - return null; // Can happen if actually nothing was instrumented, since class of intrest hasn't been loaded + return null; // Can happen if actually nothing was instrumented, since class of interest hasn't been loaded } methodName = methodName.intern(); diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ObjLivenessInstrCallsInjector.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ObjLivenessInstrCallsInjector.java index aad197963a..7d29a5f12f 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ObjLivenessInstrCallsInjector.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ObjLivenessInstrCallsInjector.java @@ -228,7 +228,7 @@ public byte[] instrumentMethod() { } } while (opcNewToInstr == 0); if (bci < bytecodesLength) { - // method was not fully instrumented -> issue warnining + // method was not fully instrumented -> issue warning String methodFQN = clazz.getName()+"."+clazz.getMethodName(methodIdx)+clazz.getMethodSignature(methodIdx); // NOI18N MiscUtils.printWarningMessage("Method "+methodFQN+" is too big to be fully instrumented."); // NOI18N } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ObjLivenessMethodInstrumentor.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ObjLivenessMethodInstrumentor.java index e317421299..b5aa142f97 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ObjLivenessMethodInstrumentor.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/ObjLivenessMethodInstrumentor.java @@ -63,7 +63,7 @@ public class ObjLivenessMethodInstrumentor extends MemoryProfMethodInstrumentor { //~ Inner Classes ------------------------------------------------------------------------------------------------------------ - static class MethodScanerForBannedInstantiations extends SingleMethodScaner { + static class MethodScannerForBannedInstantiations extends SingleMethodScanner { //~ Instance fields ------------------------------------------------------------------------------------------------------ protected boolean[] unprofiledClassStatusArray; @@ -158,11 +158,11 @@ public ObjLivenessMethodInstrumentor(ProfilingSessionStatus status, ProfilerEngi * instrumentation for unprofiled classes is removed (but for others it's still in place). */ public Object[] getMethodsToInstrumentUponClassUnprofiling(boolean[] unprofiledClassStatusArray) { - MethodScanerForBannedInstantiations msbi; + MethodScannerForBannedInstantiations msbi; operationCode = SELECTIVE_INSTR_REMOVAL; initInstrumentationPackData(); - msbi = new MethodScanerForBannedInstantiations(); + msbi = new MethodScannerForBannedInstantiations(); msbi.setUnprofiledClassStatusArray(unprofiledClassStatusArray); setAllUnprofiledClassStatusArray(unprofiledClassStatusArray); diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor.java index 579e2a5acf..63e6da774b 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor.java @@ -270,7 +270,7 @@ protected boolean scanBytecode(DynamicClassInfo clazz, byte[] code) { } else { switch (opcode) { case opc_tableswitch: { - int tbl = (offset + 1 + 3) & (~3); // four byte boundry + int tbl = (offset + 1 + 3) & (~3); // four byte boundary long default_skip = intAt(tbl, 0); long low = intAt(tbl, 1); long high = intAt(tbl, 2); @@ -280,7 +280,7 @@ protected boolean scanBytecode(DynamicClassInfo clazz, byte[] code) { break; } case opc_lookupswitch: { - int tbl = (offset + 1 + 3) & (~3); // four byte boundry + int tbl = (offset + 1 + 3) & (~3); // four byte boundary long default_skip = intAt(tbl, 0); int npairs = (int) intAt(tbl, 1); int nints = npairs * 2; @@ -534,7 +534,7 @@ private Object[] createInstrumentedMethodPack15() { imInClass++; methodIdx++; } else if (points.length > 0) { - replacementMethodInfos[i] = InstrumentationFactory.instrumentAsProiflePointHitMethod(clazz, i, + replacementMethodInfos[i] = InstrumentationFactory.instrumentAsProfilePointHitMethod(clazz, i, normalInjectionType, points); clazz.saveMethodInfo(i, replacementMethodInfos[i]); diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor1.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor1.java index fe59344e29..8fb7197d3b 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor1.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor1.java @@ -320,7 +320,7 @@ protected void findAndMarkOverridingMethodsReachable(DynamicClassInfo superClass boolean isMarker = superClass.isMethodMarker(i); // int idx = subClass.overridesVirtualMethod(superClass, i); - I once tried this, but with no visible effect. Strict check - // for whether a method with the same name and signature in subclass really overrrides a method in superclass, given all other + // for whether a method with the same name and signature in subclass really overrides a method in superclass, given all other // conditions that we have already checked (e.g. that the method in superclass is not private), will only detect a pathological // case when both method versions are package-private. This is rare, if ever happens at all. locateAndMarkMethodReachable(subClass, methodNames[i], methodSignatures[i], true, lookupInSuper, false, isMarker); @@ -366,7 +366,7 @@ protected void processInvoke(DynamicClassInfo clazz, boolean virtualCall, int in } /** - * If instrumenteSpawnedThreads is true and the given class implements Runnable, find and mark as root its run() method. + * If instrumentSpawnedThreads is true and the given class implements Runnable, find and mark as root its run() method. */ protected boolean tryInstrumentSpawnedThreads(DynamicClassInfo clazz) { if (instrumentSpawnedThreads) { diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor2.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor2.java index 71cf03d3fb..b5861239ca 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor2.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor2.java @@ -298,7 +298,7 @@ protected void findAndMarkOverridingMethodsReachable(DynamicClassInfo superClass } // int idx = subClass.overridesVirtualMethod(superClass, i); - I once tried this, but with no visible effect. Strict check - // for whether a method with the same name and signature in subclass really overrrides a method in superclass, given all other + // for whether a method with the same name and signature in subclass really overrides a method in superclass, given all other // conditions that we have already checked (e.g. that the method in superclass is not private), will only detect a pathological // case when both method versions are package-private. This is rare, if ever happens at all. checkAndScanMethod(subClass, methodNames[i], methodSignatures[i], true, false, false); diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor3.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor3.java index bdf63e058e..854f6289aa 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor3.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/RecursiveMethodInstrumentor3.java @@ -202,11 +202,11 @@ public Object[] getMethodsToInstrumentUponReflectInvoke(String className, int cl } protected void findAndMarkOverridingMethodsReachable(DynamicClassInfo superClass, DynamicClassInfo subClass) { - // Doesn't do anything (actually not used/called at all) in this scaner + // Doesn't do anything (actually not used/called at all) in this scanner } protected void processInvoke(DynamicClassInfo clazz, boolean virtualCall, int index) { - // Doesn't do anything (not used) in this scaner + // Doesn't do anything (not used) in this scanner } protected boolean tryInstrumentSpawnedThreads(DynamicClassInfo clazz) { diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/SingleMethodScaner.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/SingleMethodScanner.java similarity index 98% rename from visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/SingleMethodScaner.java rename to visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/SingleMethodScanner.java index c8b7634fbe..d62658c572 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/SingleMethodScaner.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/SingleMethodScanner.java @@ -51,7 +51,7 @@ * * @author Misha Dmitriev */ -public class SingleMethodScaner implements JavaClassConstants { +public class SingleMethodScanner implements JavaClassConstants { //~ Static fields/initializers ----------------------------------------------------------------------------------------------- // The following array is re-used,to avoid excessive object allocations - which means that THIS CLASS IS NOT MULTITHREAD-SAFE! @@ -68,10 +68,10 @@ public class SingleMethodScaner implements JavaClassConstants { //~ Constructors ------------------------------------------------------------------------------------------------------------- - public SingleMethodScaner() { + public SingleMethodScanner() { } - public SingleMethodScaner(ClassInfo clazz, int methodIdx) { + public SingleMethodScanner(ClassInfo clazz, int methodIdx) { setClassAndMethod(clazz, methodIdx); } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/jps/JpsProxy.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/jps/JpsProxy.java index c6e18432ee..b0bedeeb25 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/jps/JpsProxy.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/jps/JpsProxy.java @@ -111,7 +111,7 @@ public static RunningVM[] getRunningVMs() { //// best just to ignore this error. continue; } catch (Exception e) { - //// certain types of errors, such as access acceptions, can be encountered when attaching to a jvm. + //// certain types of errors, such as access exceptions, can be encountered when attaching to a jvm. //// These are reported as exceptions, not as some subclass of security exception. //// FIXME - we should probably have some provision for logging these types of errors, or possibly just print out the diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/RuntimeCCTNodeProcessor.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/RuntimeCCTNodeProcessor.java index e961280e4d..d10f28480f 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/RuntimeCCTNodeProcessor.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/RuntimeCCTNodeProcessor.java @@ -99,7 +99,7 @@ final public void onBackout(RuntimeCCTNode node) { } else if (node instanceof ServletRequestCPUCCTNode) { onBackout((ServletRequestCPUCCTNode)node); } else { - LOGGER.log(Level.WARNING, "Can not process uncrecoginzed node class {0}", node.getClass()); + LOGGER.log(Level.WARNING, "Can not process unrecognized node class {0}", node.getClass()); } } @@ -116,7 +116,7 @@ final public void onNode(RuntimeCCTNode node) { } else if (node instanceof ServletRequestCPUCCTNode) { onNode((ServletRequestCPUCCTNode)node); } else { - LOGGER.log(Level.WARNING, "Can not process uncrecoginzed node class {0}", node.getClass()); + LOGGER.log(Level.WARNING, "Can not process unrecognized node class {0}", node.getClass()); } } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/Bundle.properties b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/Bundle.properties index a4980a806a..3029c51a06 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/Bundle.properties +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/Bundle.properties @@ -47,4 +47,4 @@ MethodIdMap_AnonymousPackageString= PrestimeCPUCCTNode_SelfTimeString=Self time -MSG_INVALID_METHODID="Invalid methodId={0} (max. accomodated methodId is {1})" \ No newline at end of file +MSG_INVALID_METHODID="Invalid methodId={0} (max. accommodated methodId is {1})" \ No newline at end of file diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/CPUCallGraphBuilder.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/CPUCallGraphBuilder.java index 3a64fd2bf2..c63d44178c 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/CPUCallGraphBuilder.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/CPUCallGraphBuilder.java @@ -304,7 +304,7 @@ public void methodExit(final int methodId, final int threadId, final int methodT ti.pop(); oneMoreNode = ti.peek(); } - // Servelt node must go with a method node; so close them together + // Servlet node must go with a method node; so close them together if (oneMoreNode instanceof ServletRequestCPUCCTNode) { // oneMoreNode.addNCalls(oldNode.getNCalls()); // oneMoreNode.addNetTime0(oldNode.getNetTime0()); @@ -353,7 +353,7 @@ public void methodExitUnstamped(final int methodId, final int threadId, final in ti.pop(); oneMoreNode = ti.peek(); } - // Servelt node must go with a method node; so close them together + // Servlet node must go with a method node; so close them together if (oneMoreNode instanceof ServletRequestCPUCCTNode) { // oneMoreNode.addNCalls(oldNode.getNCalls()); // oneMoreNode.addNetTime0(oldNode.getNetTime0()); @@ -603,7 +603,7 @@ public void timeAdjust(final int threadId, final long timeDiff0, final long time ThreadInfo ti = threadInfos.threadInfos[threadId]; // In this case, time stamps are actually time adjustments. - // timeStamp0 is always abosolute and timeStamp1 is always thread CPU. + // timeStamp0 is always absolute and timeStamp1 is always thread CPU. ti.rootMethodEntryTimeAbs += timeDiff0; ti.rootMethodEntryTimeThreadCPU += timeDiff1; ti.topMethodEntryTime0 += timeDiff0; @@ -916,7 +916,7 @@ protected void doBatchStop() { protected void doReset() { boolean threadLocked = threadInfos.beginTrans(true, true); - if (threadLocked) { // ignore request for reset received durin an ongoing active transaction + if (threadLocked) { // ignore request for reset received during an ongoing active transaction try { threadInfos.reset(); @@ -1462,7 +1462,7 @@ private TimedCPUCCTNode rootMethodExit(final int methodId, final ThreadInfo ti, if (methodId != methodNode.getMethodId()) { StringBuilder message = new StringBuilder(); - message.append(CommonConstants.ENGINE_WARNING).append("critical: stack integrity violation on root thod exit.\n"); // NOI18N + message.append(CommonConstants.ENGINE_WARNING).append("critical: stack integrity violation on root method exit.\n"); // NOI18N message.append("*** methodId on simulated stack top: ").append((int) methodNode.getMethodId()).append('\n'); // NOI18N message.append(", received methodId (should match) = ").append((int) methodId).append('\n'); // NOI18N message.append("received method debug: ").append(debugMethod(methodId)).append('\n'); // NOI18N diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/PrestimeCPUCCTNode.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/PrestimeCPUCCTNode.java index 76743f6c92..b0912318bc 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/PrestimeCPUCCTNode.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/PrestimeCPUCCTNode.java @@ -218,11 +218,11 @@ public void merge(CCTNode node) { } protected static Collection resolveChildren(PrestimeCPUCCTNode node) { - List chldrn = new ArrayList(); - PrestimeCPUCCTNode[] chld = (PrestimeCPUCCTNode[])node.getChildren(); - if (chld != null) for (PrestimeCPUCCTNode chl : chld) - if (!chl.isSelfTimeNode()) chldrn.add(chl); - return chldrn; + List children = new ArrayList(); + PrestimeCPUCCTNode[] child = (PrestimeCPUCCTNode[])node.getChildren(); + if (child != null) for (PrestimeCPUCCTNode chl : child) + if (!chl.isSelfTimeNode()) children.add(chl); + return children; } // --- diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/StackTraceSnapshotBuilder.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/StackTraceSnapshotBuilder.java index f7046929c3..a87f475711 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/StackTraceSnapshotBuilder.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/StackTraceSnapshotBuilder.java @@ -462,7 +462,7 @@ private long processDumpTimeStamp(long dumpTimeStamp) { synchronized(stampLock) { if (dumpTimeStamp <= currentDumpTimeStamp) { // issue #171756 - ignore misplaced samples - // montonicity of System.nanoTime is not presently guaranteed (CR 6458294) + // monotonicity of System.nanoTime is not presently guaranteed (CR 6458294) // throw new IllegalStateException("Adding stacktrace with timestamp " + dumpTimeStamp + " is not allowed after a stacktrace with timestamp " + currentDumpTimeStamp + " has been added"); return -1; } @@ -651,7 +651,7 @@ private void setDefaultTiming() { } /** - * Creates CPUResultsSnapsot + * Creates CPUResultsSnapshot * @param since time in milliseconds * @return snapshot * @throws org.graalvm.visualvm.lib.jfluid.results.cpu.CPUResultsSnapshot.NoDataAvailableException diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/ThreadInfo.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/ThreadInfo.java index 34c9a96d8c..9c5d74ff54 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/ThreadInfo.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/ThreadInfo.java @@ -48,7 +48,7 @@ public class ThreadInfo { //~ Static fields/initializers ------------------------------------------------------------------------------------------- // The following variable is used to record the "compensation" value, a difference between the timestamp at the // moment user hits "get results" and the timestamp for the method entry into the top stack method. To present - // results consistenly, we add this value to the TimedCPUCCTNode for the top-stack method. However, when + // results consistently, we add this value to the TimedCPUCCTNode for the top-stack method. However, when // processing of data is resumed, we need to subtract this value back from that node. // This is effectively the self time for the last invocation of the top method on stack - if we would not keep // it separately, it would not be reported @@ -73,7 +73,7 @@ public class ThreadInfo { // - blackout data subtracted, calibration data not public long rootMethodEntryTimeAbs; public long rootMethodEntryTimeThreadCPU; - // Absoute and thread CPU entry timestamps for the root method. + // Absolute and thread CPU entry timestamps for the root method. // The xxx0 part is used when only absolute or thread CPU time data is collected. // Both xxx0 and xx1 parts are used when both timestamps are collected. public long topMethodEntryTime0; diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/TimingAdjuster.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/TimingAdjuster.java index e9c74e8848..faa30effc2 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/TimingAdjuster.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/TimingAdjuster.java @@ -60,11 +60,11 @@ public class TimingAdjuster { // calculateTimingData(status, collectingTwoTimeStamps); // } // - // final public synchronized TimeStamp adjustTime(TimeStamp time, int incommingInv, int outgoingInv) { + // final public synchronized TimeStamp adjustTime(TimeStamp time, int incomingInv, int outgoingInv) { // TimeStamp result = null; // - // long timeExCleansed = timingData.timerCountsInSecond1 == 0 ? 0 : (long)((double) time.getExtendedTime() - incommingInv * timingData.methodEntryExitInnerTime1 - outgoingInv * timingData.methodEntryExitOuterTime1) * 1000000 / timingData.timerCountsInSecond1; - // long timeCleansed = timingData.timerCountsInSecond0 == 0 ? 0 : (long)((double) time.getTime() - incommingInv * timingData.methodEntryExitInnerTime0 - outgoingInv * timingData.methodEntryExitOuterTime0) * 1000000 / timingData.timerCountsInSecond0; + // long timeExCleansed = timingData.timerCountsInSecond1 == 0 ? 0 : (long)((double) time.getExtendedTime() - incomingInv * timingData.methodEntryExitInnerTime1 - outgoingInv * timingData.methodEntryExitOuterTime1) * 1000000 / timingData.timerCountsInSecond1; + // long timeCleansed = timingData.timerCountsInSecond0 == 0 ? 0 : (long)((double) time.getTime() - incomingInv * timingData.methodEntryExitInnerTime0 - outgoingInv * timingData.methodEntryExitOuterTime0) * 1000000 / timingData.timerCountsInSecond0; // // timeCleansed = timeCleansed < 0 ? 0 : timeCleansed; // timeExCleansed = timeExCleansed < 0 ? 0 : timeExCleansed; @@ -74,23 +74,23 @@ public class TimingAdjuster { // return result; // } // - // final public synchronized double delta(int incommingInv, int outgoingInv, boolean secondTimestamp) { + // final public synchronized double delta(int incomingInv, int outgoingInv, boolean secondTimestamp) { // double adjusted = 0; // if (secondTimestamp) { - // adjusted = ((double) incommingInv * timingData.methodEntryExitInnerTime1 - outgoingInv * timingData.methodEntryExitOuterTime1) * 1000000 / timingData.timerCountsInSecond1; + // adjusted = ((double) incomingInv * timingData.methodEntryExitInnerTime1 - outgoingInv * timingData.methodEntryExitOuterTime1) * 1000000 / timingData.timerCountsInSecond1; // } else { - // adjusted = ((double) incommingInv * timingData.methodEntryExitInnerTime0 - outgoingInv * timingData.methodEntryExitOuterTime0) * 1000000 / timingData.timerCountsInSecond0; + // adjusted = ((double) incomingInv * timingData.methodEntryExitInnerTime0 - outgoingInv * timingData.methodEntryExitOuterTime0) * 1000000 / timingData.timerCountsInSecond0; // } // // if (adjusted < 0) adjusted = 0; // return adjusted; // } // - // final public synchronized boolean isAdjustible(long time, int incommingInv, int outgoingInv, boolean secondTimestamp) { + // final public synchronized boolean isAdjustable(long time, int incomingInv, int outgoingInv, boolean secondTimestamp) { // if (secondTimestamp) { - // return time > (incommingInv * timingData.methodEntryExitInnerTime1 + outgoingInv * timingData.methodEntryExitOuterTime1); + // return time > (incomingInv * timingData.methodEntryExitInnerTime1 + outgoingInv * timingData.methodEntryExitOuterTime1); // } else { - // return time > (incommingInv * timingData.methodEntryExitInnerTime0 + outgoingInv * timingData.methodEntryExitOuterTime0); + // return time > (incomingInv * timingData.methodEntryExitInnerTime0 + outgoingInv * timingData.methodEntryExitOuterTime0); // } // } // diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/TimingAdjusterOld.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/TimingAdjusterOld.java index e388377c8c..60580109c4 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/TimingAdjusterOld.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/TimingAdjusterOld.java @@ -119,7 +119,7 @@ public static synchronized TimingAdjusterOld getInstance(final ProfilingSessionS return instance; } - public final double adjustTime(long time, int incommingInv, int outgoingInv, boolean secondTimestamp) { + public final double adjustTime(long time, int incomingInv, int outgoingInv, boolean secondTimestamp) { if (timingData == null) { return (double) time; } @@ -133,15 +133,15 @@ public final double adjustTime(long time, int incommingInv, int outgoingInv, boo } if (secondTimestamp) { - return (((double) time - (incommingInv * timingData.methodEntryExitInnerTime1) + return (((double) time - (incomingInv * timingData.methodEntryExitInnerTime1) - (outgoingInv * timingData.methodEntryExitOuterTime1)) * 1000000) / timingData.timerCountsInSecond1; } else { - return (((double) time - (incommingInv * timingData.methodEntryExitInnerTime0) + return (((double) time - (incomingInv * timingData.methodEntryExitInnerTime0) - (outgoingInv * timingData.methodEntryExitOuterTime0)) * 1000000) / timingData.timerCountsInSecond0; } } - public final double delta(int incommingInv, int outgoingInv, boolean secondTimestamp) { + public final double delta(int incomingInv, int outgoingInv, boolean secondTimestamp) { if (timingData == null || timingData.methodEntryExitCallTime0 == 0) { return 0d; } @@ -149,10 +149,10 @@ public final double delta(int incommingInv, int outgoingInv, boolean secondTimes double adjusted = 0; if (secondTimestamp) { - adjusted = ((((double) incommingInv * timingData.methodEntryExitInnerTime1) + adjusted = ((((double) incomingInv * timingData.methodEntryExitInnerTime1) + (outgoingInv * timingData.methodEntryExitOuterTime1)) * 1000000) / timingData.timerCountsInSecond1; } else { - adjusted = ((((double) incommingInv * timingData.methodEntryExitInnerTime0) + adjusted = ((((double) incomingInv * timingData.methodEntryExitInnerTime0) + (outgoingInv * timingData.methodEntryExitOuterTime0)) * 1000000) / timingData.timerCountsInSecond0; } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/jdbc/JdbcGraphBuilder.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/jdbc/JdbcGraphBuilder.java index d134e9758e..c896327a8c 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/jdbc/JdbcGraphBuilder.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/jdbc/JdbcGraphBuilder.java @@ -403,7 +403,7 @@ public void timeAdjust(final int threadId, final long timeDiff0, final long time ThreadInfo ti = threadInfos.threadInfos[threadId]; // In this case, time stamps are actually time adjustments. - // timeStamp0 is always abosolute and timeStamp1 is always thread CPU. + // timeStamp0 is always absolute and timeStamp1 is always thread CPU. ti.rootMethodEntryTimeAbs += timeDiff0; ti.rootMethodEntryTimeThreadCPU += timeDiff1; ti.topMethodEntryTime0 += timeDiff0; @@ -681,7 +681,7 @@ private RuntimeMemoryCCTNode processStackTrace(int selectId, int[] methodIds) { // "terminal nodes", like RuntimeObjAllocTermCCTNode or RuntimeObjLivenessTermCCTNode. Such nodes contain information // that is normally the same for the whole call chain - such as total number/size of objects of the given type allocated // by this call chain. However, it looks like in some cases (different threads?) it may happen that one complete call - // chain may become a fragment of another, longer call chain. In that case we will neeed to have a "terminal" node in the middle + // chain may become a fragment of another, longer call chain. In that case we will need to have a "terminal" node in the middle // of the chain. Here we are checking for the case when first a longer chain is created, and then a shorter one that // matches a part of the longer one is found, and taking measures. if (curNode.getClass() == RuntimeMemoryCCTNode.class) { @@ -690,7 +690,7 @@ private RuntimeMemoryCCTNode processStackTrace(int selectId, int[] methodIds) { if (parentNode != null) { Object parChildren = parentNode.children; - assert (parChildren != null); // parent will always have chilren + assert (parChildren != null); // parent will always have children if (parChildren instanceof RuntimeMemoryCCTNode) { if (parChildren == curNode) { diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/jdbc/SQLStatement.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/jdbc/SQLStatement.java index eca97e585c..66a886bb99 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/jdbc/SQLStatement.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/jdbc/SQLStatement.java @@ -445,7 +445,7 @@ private String getFullSql() { if (parindex >= parameters.size()) { par = "!!!!!UNSET"; // NOI18N } else { - par = formatParamter(parameters.get(parindex++)); + par = formatParameter(parameters.get(parindex++)); } } fullSql.append(sqlTemplate.substring(lindex, qindex)); @@ -455,7 +455,7 @@ private String getFullSql() { return fullSql.toString(); } - private String formatParamter(Object par) { + private String formatParameter(Object par) { if (par instanceof String) { return "'"+par+"'"; } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/locks/LockGraphBuilder.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/locks/LockGraphBuilder.java index 4ff20a822c..bf7500e294 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/locks/LockGraphBuilder.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/locks/LockGraphBuilder.java @@ -108,7 +108,7 @@ protected void doReset() { } boolean threadLocked = transaction.beginTrans(true, true); - if (threadLocked) { // ignore request for reset received durin an ongoing active transaction + if (threadLocked) { // ignore request for reset received during an ongoing active transaction try { threadInfos.reset(); diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/Bundle.properties b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/Bundle.properties index fb00dd7e21..362a8de2d3 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/Bundle.properties +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/Bundle.properties @@ -39,7 +39,7 @@ # Version 2 license, then the option applies only if the new code is # made subject to such option by the copyright holder. -SampledMemoryResultsSnapshot_MemorySamledMsg=Memory (Sampling)\: {0} +SampledMemoryResultsSnapshot_MemorySampledMsg=Memory (Sampling)\: {0} AllocMemoryResultsSnapshot_MemoryAllocMsg=Memory (Allocations)\: {0} diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/LivenessMemoryResultsSnapshot.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/LivenessMemoryResultsSnapshot.java index 0699a73bb6..9a712facf1 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/LivenessMemoryResultsSnapshot.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/LivenessMemoryResultsSnapshot.java @@ -71,12 +71,12 @@ public class LivenessMemoryResultsSnapshot extends MemoryResultsSnapshot { /** [0 - nProfiledClasses] index: classId, average object age for class */ private float[] avgObjectAge; - /** [0 - nProfiledClasses] index: classId, contains tracked live instrances # for this class - + /** [0 - nProfiledClasses] index: classId, contains tracked live instances # for this class - * assumption: smaller than allocated, thus only int */ private int[] maxSurvGen; private int[] nTotalAllocObjects; - /** [0 - nProfiledClasses] index: classId, contains tracked allocated instrances # for this class */ + /** [0 - nProfiledClasses] index: classId, contains tracked allocated instances # for this class */ private long[] nTrackedAllocObjects; private int[] nTrackedLiveObjects; private long[] trackedLiveObjectsSize; diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/MemoryCCTManager.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/MemoryCCTManager.java index 1a95e38d17..f93652f0d7 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/MemoryCCTManager.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/MemoryCCTManager.java @@ -77,7 +77,7 @@ public boolean isEmpty() { } /** - * @return The root noe of allocation stack traces or null if empty. + * @return The root node of allocation stack traces or null if empty. * @see #isEmpty() */ public PresoObjAllocCCTNode getRootNode() { diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/MemoryCallGraphBuilder.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/MemoryCallGraphBuilder.java index b2f45123e1..2077550cfa 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/MemoryCallGraphBuilder.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/MemoryCallGraphBuilder.java @@ -71,7 +71,7 @@ private static class ObjIdToCCTNodeMap { //~ Instance fields ------------------------------------------------------------------------------------------------------ /** [0-capacity] individual tracked instances Ids, also replicated at the server side - - * bit combination opf epoch, classId & sequential counter */ + * bit combination of epoch, classId & sequential counter */ private long[] keys; /** [0-capacity] size in Bytes of tracked instance */ @@ -747,7 +747,7 @@ private RuntimeMemoryCCTNode processStackTrace(char classId, int[] methodIds, bo // "terminal nodes", like RuntimeObjAllocTermCCTNode or RuntimeObjLivenessTermCCTNode. Such nodes contain information // that is normally the same for the whole call chain - such as total number/size of objects of the given type allocated // by this call chain. However, it looks like in some cases (different threads?) it may happen that one complete call - // chain may become a fragment of another, longer call chain. In that case we will neeed to have a "terminal" node in the middle + // chain may become a fragment of another, longer call chain. In that case we will need to have a "terminal" node in the middle // of the chain. Here we are checking for the case when first a longer chain is created, and then a shorter one that // matches a part of the longer one is found, and taking measures. if (curNode.getClass() == RuntimeMemoryCCTNode.class) { @@ -756,7 +756,7 @@ private RuntimeMemoryCCTNode processStackTrace(char classId, int[] methodIds, bo if (parentNode != null) { Object parChildren = parentNode.children; - assert (parChildren != null); // parent will always have chilren + assert (parChildren != null); // parent will always have children if (parChildren instanceof RuntimeMemoryCCTNode) { if (parChildren == curNode) { diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/PresoObjAllocCCTNode.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/PresoObjAllocCCTNode.java index 6ccf6727ce..00cb91ea55 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/PresoObjAllocCCTNode.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/PresoObjAllocCCTNode.java @@ -76,7 +76,7 @@ public class PresoObjAllocCCTNode extends CCTNode { public static final String VM_ALLOC_METHOD = "traceVMObjectAlloc"; // NOI18N private static final String VM_ALLOC_TEXT = ResourceBundle.getBundle("org.graalvm.visualvm.lib.jfluid.results.memory.Bundle") // NOI18N .getString("PresoObjAllocCCTNode_VMAllocMsg"); // NOI18N - private static final String UKNOWN_NODENAME = ResourceBundle.getBundle("org.graalvm.visualvm.lib.jfluid.results.memory.Bundle") // NOI18N + private static final String UNKNOWN_NODENAME = ResourceBundle.getBundle("org.graalvm.visualvm.lib.jfluid.results.memory.Bundle") // NOI18N .getString("PresoObjAllocCCTNode_UnknownMsg"); // NOI18N public static final int SORT_BY_NAME = 1; public static final int SORT_BY_ALLOC_OBJ_SIZE = 2; @@ -178,8 +178,8 @@ public void merge(CCTNode node) { } protected static Collection resolveChildren(PresoObjAllocCCTNode node) { - PresoObjAllocCCTNode[] chldrn = (PresoObjAllocCCTNode[])node.getChildren(); - return chldrn == null ? Collections.EMPTY_LIST : Arrays.asList(chldrn); + PresoObjAllocCCTNode[] children = (PresoObjAllocCCTNode[])node.getChildren(); + return children == null ? Collections.EMPTY_LIST : Arrays.asList(children); } // --- @@ -267,7 +267,7 @@ public String getNodeName() { } else if (getClassName() != null) { nodeName = getClassName(); } else { - nodeName = UKNOWN_NODENAME; + nodeName = UNKNOWN_NODENAME; } } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/RuntimeObjLivenessTermCCTNode.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/RuntimeObjLivenessTermCCTNode.java index a7886c02fe..f076fa7e32 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/RuntimeObjLivenessTermCCTNode.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/RuntimeObjLivenessTermCCTNode.java @@ -53,7 +53,7 @@ * Contains the information gathered during object liveness profiling, which can be calculated for intermediate nodes * if known for terminal nodes. *

- * Normally used as a leaf, except in case there are multiple same paths in the tree with differfent length. + * Normally used as a leaf, except in case there are multiple same paths in the tree with different length. *

* The information in TermCCTNode represents all objects of the same type allocated using same call path. * diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/SampledMemoryResultsSnapshot.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/SampledMemoryResultsSnapshot.java index 8fe1949372..1bdfa60da1 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/SampledMemoryResultsSnapshot.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/memory/SampledMemoryResultsSnapshot.java @@ -63,7 +63,7 @@ public class SampledMemoryResultsSnapshot extends MemoryResultsSnapshot { // ----- // I18N String constants - private static final String MEMORY_SAMPLED_MSG = ResourceBundle.getBundle("org.graalvm.visualvm.lib.jfluid.results.memory.Bundle").getString("SampledMemoryResultsSnapshot_MemorySamledMsg"); // NOI18N + private static final String MEMORY_SAMPLED_MSG = ResourceBundle.getBundle("org.graalvm.visualvm.lib.jfluid.results.memory.Bundle").getString("SampledMemoryResultsSnapshot_MemorySampledMsg"); // NOI18N // ----- //~ Instance fields ---------------------------------------------------------------------------------------------------------- diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/monitor/VMTelemetryDataManager.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/monitor/VMTelemetryDataManager.java index 8146cec835..6b9d870bb1 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/monitor/VMTelemetryDataManager.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/monitor/VMTelemetryDataManager.java @@ -62,7 +62,7 @@ public class VMTelemetryDataManager extends DataManager { public long[] freeMemory; public long[] lastGCPauseInMS; public long[] loadedClassesCount; - public long[] processCPUTimeInPromile; + public long[] processCPUTimeInProfile; public long[] nSurvivingGenerations; public long[] nSystemThreads; public long[] nTotalThreads; @@ -72,7 +72,7 @@ public class VMTelemetryDataManager extends DataManager { public long[] totalMemory; public long[] usedMemory; - public long[][] gcFinishs; + public long[][] gcFinishes; public long[][] gcStarts; public long maxHeapSize = Long.MAX_VALUE; // value of Xmx, constant within one profiling session @@ -128,7 +128,7 @@ public synchronized MonitoredData getLastData() { // --- Public runtime API ---------------------------------------------------- public synchronized void processData(MonitoredData data) { - long cpuTimeInPromile; + long cpuTimeInProfile; long processCPUTime = data.getProcessCpuTime(); if (processCPUTime != -1) { @@ -136,16 +136,16 @@ public synchronized void processData(MonitoredData data) { long cpuDiffInMicroSec = (processCPUTime - lastData.getProcessCpuTime())/1000L; long timeDiffMicroSec = (data.getTimestamp() - lastData.getTimestamp())*1000L; if (timeDiffMicroSec < 1000) timeDiffMicroSec = 1000; - cpuTimeInPromile = (1000*cpuDiffInMicroSec)/timeDiffMicroSec; + cpuTimeInProfile = (1000*cpuDiffInMicroSec)/timeDiffMicroSec; } else { - cpuTimeInPromile = 0; + cpuTimeInProfile = 0; } } else { - cpuTimeInPromile = -1; + cpuTimeInProfile = -1; } addValuesInternal(data.getTimestamp(), data.getFreeMemory(), data.getTotalMemory(), data.getNUserThreads(), data.getNSystemThreads(), data.getNSurvivingGenerations(), data.getRelativeGCTimeInPerMil(), - data.getLastGCPauseInMS(), data.getLoadedClassesCount(), cpuTimeInPromile, data.getGCStarts(), data.getGCFinishs()); + data.getLastGCPauseInMS(), data.getLoadedClassesCount(), cpuTimeInProfile, data.getGCStarts(), data.getGCFinishes()); lastData = data; } @@ -176,12 +176,12 @@ public synchronized void reset() { loadedClassesCount = new long[arrayBufferSize]; - processCPUTimeInPromile = new long[arrayBufferSize]; + processCPUTimeInProfile = new long[arrayBufferSize]; currentArraysSize = arrayBufferSize; gcStarts = new long[arrayBufferSize][]; - gcFinishs = new long[arrayBufferSize][]; + gcFinishes = new long[arrayBufferSize][]; firstStart = true; lastUnpairedStart = -1; @@ -192,8 +192,8 @@ public synchronized void reset() { // --- Data storage management ----------------------------------------------- private void addValuesInternal(long timeStamp, long freeMemory, long totalMemory, long nUserThreads, long nSystemThreads, long nSurvivingGenerations, long relativeGCTimeInPerMil, long lastGCPauseInMS, - long loadedClassesCount, long cpuTimeInPromile, long[] gcStarts, - long[] gcFinishs) { + long loadedClassesCount, long cpuTimeInProfile, long[] gcStarts, + long[] gcFinishes) { checkArraysSize(); this.timeStamps[itemCount] = timeStamp; @@ -209,26 +209,26 @@ private void addValuesInternal(long timeStamp, long freeMemory, long totalMemory this.relativeGCTimeInPerMil[itemCount] = relativeGCTimeInPerMil; this.lastGCPauseInMS[itemCount] = lastGCPauseInMS; this.loadedClassesCount[itemCount] = loadedClassesCount; - this.processCPUTimeInPromile[itemCount] = cpuTimeInPromile; + this.processCPUTimeInProfile[itemCount] = cpuTimeInProfile; - if (gcStarts.length > 0 || gcFinishs.length > 0) { + if (gcStarts.length > 0 || gcFinishes.length > 0) { // // Ensure the first event is gc start (filter-out leading gc end) // if (firstStart && gcStarts.length > 0) { -// if (gcFinishs.length > 0 && gcStarts[0] > gcFinishs[0]) { -// long[] gcFinishs2 = new long[gcFinishs.length - 1]; -// if (gcFinishs2.length > 0) System.arraycopy(gcFinishs, 1, -// gcFinishs2, 0, -// gcFinishs2.length); -// gcFinishs = gcFinishs2; +// if (gcFinishes.length > 0 && gcStarts[0] > gcFinishes[0]) { +// long[] gcFinishes2 = new long[gcFinishes.length - 1]; +// if (gcFinishes2.length > 0) System.arraycopy(gcFinishes, 1, +// gcFinishes2, 0, +// gcFinishes2.length); +// gcFinishes = gcFinishes2; // } // firstStart = false; // } // Ensure the first event is gc start (fake leading gc start) int starts = gcStarts.length; - if (firstStart && (starts > 0 || gcFinishs.length > 0)) { - if (starts == 0 || gcStarts[0] > gcFinishs[0]) { + if (firstStart && (starts > 0 || gcFinishes.length > 0)) { + if (starts == 0 || gcStarts[0] > gcFinishes[0]) { long[] gcStarts2 = new long[starts + 1]; if (starts > 0) System.arraycopy(gcStarts, 0, gcStarts2, 1, starts); gcStarts2[0] = timeStamps[0]; @@ -238,15 +238,15 @@ private void addValuesInternal(long timeStamp, long freeMemory, long totalMemory } // Check if this item is paired - boolean sameStartsFinishsCount = gcStarts.length == gcFinishs.length; - boolean thisItemsPaired = (sameStartsFinishsCount && lastUnpairedStart == -1) || - (!sameStartsFinishsCount && lastUnpairedStart != -1); + boolean sameStartsFinishesCount = gcStarts.length == gcFinishes.length; + boolean thisItemsPaired = (sameStartsFinishesCount && lastUnpairedStart == -1) || + (!sameStartsFinishesCount && lastUnpairedStart != -1); // Prepare extra buffer for unpaired items int extraItemsBuffer = thisItemsPaired ? 0 : 1; // Compute length of new data - int newItemsLength = Math.max(gcStarts.length, gcFinishs.length) + + int newItemsLength = Math.max(gcStarts.length, gcFinishes.length) + extraItemsBuffer; // Add new gc starts @@ -260,25 +260,25 @@ private void addValuesInternal(long timeStamp, long freeMemory, long totalMemory } // Add new gc finishs - if (gcFinishs.length == newItemsLength) { - this.gcFinishs[itemCount] = gcFinishs; + if (gcFinishes.length == newItemsLength) { + this.gcFinishes[itemCount] = gcFinishes; } else { - this.gcFinishs[itemCount] = new long[newItemsLength]; - System.arraycopy(gcFinishs, 0, - this.gcFinishs[itemCount], 0, - gcFinishs.length); + this.gcFinishes[itemCount] = new long[newItemsLength]; + System.arraycopy(gcFinishes, 0, + this.gcFinishes[itemCount], 0, + gcFinishes.length); } // Mark the unpaired finish if (!thisItemsPaired) { - this.gcFinishs[itemCount][newItemsLength - 1] = -1; + this.gcFinishes[itemCount][newItemsLength - 1] = -1; } // Fix the unpaired start if (lastUnpairedStart != -1) { long[] unpairedStarts = this.gcStarts[lastUnpairedStart]; - long[] unpairedFinishs = this.gcFinishs[lastUnpairedStart]; - unpairedFinishs[unpairedFinishs.length - 1] = this.gcFinishs[itemCount][0]; + long[] unpairedFinishes = this.gcFinishes[lastUnpairedStart]; + unpairedFinishes[unpairedFinishes.length - 1] = this.gcFinishes[itemCount][0]; this.gcStarts[itemCount][0] = unpairedStarts[unpairedStarts.length - 1]; } @@ -291,7 +291,7 @@ private void addValuesInternal(long timeStamp, long freeMemory, long totalMemory } else { this.gcStarts[itemCount] = gcStarts; - this.gcFinishs[itemCount] = gcFinishs; + this.gcFinishes[itemCount] = gcFinishes; } itemCount++; @@ -313,10 +313,10 @@ private void checkArraysSize() { relativeGCTimeInPerMil = extendArray(relativeGCTimeInPerMil, arrayBufferSize); lastGCPauseInMS = extendArray(lastGCPauseInMS, arrayBufferSize); loadedClassesCount = extendArray(loadedClassesCount, arrayBufferSize); - processCPUTimeInPromile = extendArray(processCPUTimeInPromile, arrayBufferSize); + processCPUTimeInProfile = extendArray(processCPUTimeInProfile, arrayBufferSize); gcStarts = extendArray(gcStarts, arrayBufferSize); - gcFinishs = extendArray(gcFinishs, arrayBufferSize); + gcFinishes = extendArray(gcFinishes, arrayBufferSize); // update current array size currentArraysSize += arrayBufferSize; diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ClassLoaderManager.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ClassLoaderManager.java index f2e7e2348b..3ff8ae9834 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ClassLoaderManager.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ClassLoaderManager.java @@ -302,7 +302,7 @@ public void run() { do { // Note that there is a small chance that this call will not really dump all information, if some - // thread isfor some reason preempted while it's in traceObjAlloc() and not let finish it. This may + // thread is for some reason preempted while it's in traceObjAlloc() and not let finish it. This may // result in some jmethodIDs not sent to client in time and thus not resolved in the call below. But // the probability of such an event seems very low, and we also have exception handlers in native // code now, to protect us from such mishaps. diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/EventBufferManager.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/EventBufferManager.java index d5507cb9b9..b62da0a0fa 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/EventBufferManager.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/EventBufferManager.java @@ -153,7 +153,7 @@ public void openBufferFile(int sizeInBytes) throws IOException { // Bugfix: http://profiler.netbeans.org/issues/show_bug.cgi?id=59166 // Summary: Temporary communication file should be accessible for all users // Bugfix details: As it does not seem to be possible to set the file permissions using Java code - // we explicitely invoke chmod on the newly created buffer file if we are on UNIX + // we explicitly invoke chmod on the newly created buffer file if we are on UNIX if (Platform.isUnix()) { try { Runtime.getRuntime().exec(new String[] { "chmod", "666", bufFileName }); // NOI18N diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/HeapHistogramManager.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/HeapHistogramManager.java index 038e8dff36..61ca89a65b 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/HeapHistogramManager.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/HeapHistogramManager.java @@ -327,7 +327,7 @@ String convertJVMName(String jvmName) { name = jvmName.substring(index + 2, jvmName.length() - 1); break; default: - System.err.println("Uknown name " + jvmName); // NOI18N + System.err.println("Unknown name " + jvmName); // NOI18N name = jvmName; } for (int i = 0; i <= index; i++) { diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/Monitors.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/Monitors.java index 1285815571..cc0bff0c84 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/Monitors.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/Monitors.java @@ -108,7 +108,7 @@ static class SurvGenAndThreadsMonitor extends Thread { public volatile boolean started; public volatile boolean terminated; - private LongList gcFinishs; + private LongList gcFinishes; private LongList gcStarts; private ThreadDataTable threadTable; private Vector markerObjects; @@ -134,7 +134,7 @@ static class SurvGenAndThreadsMonitor extends Thread { allThreadStatusRough = new int[20]; threadTable = new ThreadDataTable(); gcStarts = new LongList(16); - gcFinishs = new LongList(16); + gcFinishes = new LongList(16); setPriority(Thread.MAX_PRIORITY); setDaemon(true); } @@ -206,7 +206,7 @@ synchronized void updateGCStartFinishData() { } if (finish > lastGCFinish) { - gcFinishs.add(finish & 0xFFFFFFFFFFFFFFL); // we use only 7 bytes for hi res timer + gcFinishes.add(finish & 0xFFFFFFFFFFFFFFL); // we use only 7 bytes for hi res timer maxFinish = finish; } } @@ -217,10 +217,10 @@ synchronized void updateGCStartFinishData() { private synchronized void getGCStartFinishData(MonitoredNumbersResponse resp) { long[] start = gcStarts.getArray(); - long[] finish = gcFinishs.getArray(); + long[] finish = gcFinishes.getArray(); gcStarts.clear(); - gcFinishs.clear(); + gcFinishes.clear(); resp.setGCstartFinishData(start, finish); } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerInterface.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerInterface.java index cb4dd3d50a..ff829ade30 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerInterface.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerInterface.java @@ -379,7 +379,7 @@ private static void computeRootWildcard() { private static volatile boolean detachStarted; - private static HeapHistogramManager heapHistgramManager; + private static HeapHistogramManager heapHistogramManager; //~ Methods ------------------------------------------------------------------------------------------------------------------ @@ -565,7 +565,7 @@ public static void initProfilerInterface(ProfilingSessionStatus status, Thread s reflectMethods = new WeakHashMap(); evBufManager = new EventBufferManager(profilerServer); - heapHistgramManager = new HeapHistogramManager(); + heapHistogramManager = new HeapHistogramManager(); ProfilerInterface.status = status; detachStarted = false; @@ -726,7 +726,7 @@ static Response computeHistogram() { Response resp = null; if (Histogram.isAvailable()) { - resp = heapHistgramManager.computeHistogram(Histogram.getRawHistogram()); + resp = heapHistogramManager.computeHistogram(Histogram.getRawHistogram()); } if (resp == null) { resp = new Response(HISTOGRAM_NOT_AVAILABLE_MSG); @@ -1085,7 +1085,7 @@ private static void classLoadHook(Class clazz) { // Note: it is important to have 'rootClassLoaded = true' here, i.e. *after* (not before) the call to getAndInstrumentClasses(). // It looks like some classes returned by getAllLoadedClasses() may be not completely initialized, and thus when we finally - // load them properly in instrumentMethodGroup() before intrumenting, they get initialized and classLoadHook is called for each + // load them properly in instrumentMethodGroup() before instrumenting, they get initialized and classLoadHook is called for each // of them. If rootClassLoaded is true, then for each such class a request is sent to the client, which wonders why it got a // second class load event for the same class. Having rootClassLoaded not set until all such classes are loaded eliminates this // issue. WARNING: may it happen that some really new class is loaded as a side effect of initializing of the classes described diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntime.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntime.java index 83846ffb09..73addbf85b 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntime.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntime.java @@ -607,7 +607,7 @@ protected static void writeThreadCreationEvent(Thread thread, int threadId) { } static void writeAdjustTimeEvent(ThreadInfo ti, long absTimeStamp, long threadTimeStamp) { - //if (printEvents) System.out.println("*** Writing ADJUST_TIME event, metodId = " + (int)methodId + ", ts = " + timeStamp); + //if (printEvents) System.out.println("*** Writing ADJUST_TIME event, methodId = " + (int)methodId + ", ts = " + timeStamp); byte[] evBuf = ti.evBuf; int curPos = ti.evBufPos; // It's important to use a local copy for evBufPos, so that evBufPos is at event boundary at any moment @@ -684,7 +684,7 @@ static long writeWaitTimeEvent(byte eventType, ThreadInfo ti, Object id, ThreadI if (ownerTi != null) { initThreadInfo(ownerTi); } - // if (printEvents) System.out.println("*** Writing event " + eventType + ", metodId = " + (int)methodId); + // if (printEvents) System.out.println("*** Writing event " + eventType + ", methodId = " + (int)methodId); int curPos = ti.evBufPos; // It's important to use a local copy for evBufPos, so that evBufPos is at event boundary at any moment if (curPos > ThreadInfo.evBufPosThreshold) { @@ -697,7 +697,7 @@ static long writeWaitTimeEvent(byte eventType, ThreadInfo ti, Object id, ThreadI evBuf[curPos++] = eventType; // Note that in the code below, we write only the 7 low bytes of the 64-bit value. The justification is that this saves - // us some performance and memory, and 2^55 == 36028797018963968 ns == 36028797 sec == 10008 hr == 416 days is a sufficent + // us some performance and memory, and 2^55 == 36028797018963968 ns == 36028797 sec == 10008 hr == 416 days is a sufficient // representation range for the foreseeable usages of our tool. (***) long absTimeStamp = Timers.getCurrentTimeInCounts(); diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeCPU.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeCPU.java index 4eac2ded5a..5dd1cd6a8a 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeCPU.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeCPU.java @@ -421,7 +421,7 @@ static void writeTimeStampedEvent(byte eventType, ThreadInfo ti, char methodId) evBuf[curPos++] = (byte) ((methodId) & 0xFF); // Note that in the code below, we write only the 7 low bytes of the 64-bit timestamp. The justification is that this saves - // us some performance and memory, and 2^55 == 36028797018963968 ns == 36028797 sec == 10008 hr == 416 days is a sufficent + // us some performance and memory, and 2^55 == 36028797018963968 ns == 36028797 sec == 10008 hr == 416 days is a sufficient // representation range for the foreseeable usages of our tool. (***) if (absoluteTimerOn) { long absTimeStamp = Timers.getCurrentTimeInCounts(); @@ -434,7 +434,7 @@ static void writeTimeStampedEvent(byte eventType, ThreadInfo ti, char methodId) evBuf[curPos++] = (byte) ((absTimeStamp) & 0xFF); if (DEBUG) { - System.out.println("ProfilerRuntimeCPU.DEBUG: Writing event (Abs) type = " + eventType + ", metodId = " + System.out.println("ProfilerRuntimeCPU.DEBUG: Writing event (Abs) type = " + eventType + ", methodId = " + (int) methodId + ", timestamp: " + absTimeStamp); // NOI18N } } @@ -450,7 +450,7 @@ static void writeTimeStampedEvent(byte eventType, ThreadInfo ti, char methodId) evBuf[curPos++] = (byte) ((threadTimeStamp) & 0xFF); if (DEBUG) { - System.out.println("ProfilerRuntimeCPU.DEBUG: Writing event (CPU) type = " + eventType + ", metodId = " + System.out.println("ProfilerRuntimeCPU.DEBUG: Writing event (CPU) type = " + eventType + ", methodId = " + (int) methodId + ", timestamp: " + threadTimeStamp); // NOI18N } } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeCPUSampledInstr.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeCPUSampledInstr.java index 51b349dd5d..fcc51fe534 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeCPUSampledInstr.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeCPUSampledInstr.java @@ -61,8 +61,8 @@ public class ProfilerRuntimeCPUSampledInstr extends ProfilerRuntimeCPU { /** A thread that periodically sets the sample flag for worker threads */ static class TimeSampler extends SamplingThread { - TimeSampler(int sampilingInterval) { - super(sampilingInterval); + TimeSampler(int samplingInterval) { + super(samplingInterval); setName(PROFILER_SPECIAL_EXEC_THREAD_NAME + " 9"); // NOI18N } @@ -403,7 +403,7 @@ static void writeCompactEvent(ThreadInfo ti, char event) { /** Write an unstamped event, such as method entry/exit for a method whose id is > MAX_METHOD_ID_FOR_COMPACT_FORMAT */ static void writeUnstampedEvent(byte eventType, ThreadInfo ti, char methodId) { - // if (printEvents) System.out.println("*** Writing unstamped event " + (int) eventType + ", metodId = " + (int)methodId); + // if (printEvents) System.out.println("*** Writing unstamped event " + (int) eventType + ", methodId = " + (int)methodId); byte[] evBuf = ti.evBuf; int curPos = ti.evBufPos; // It's important to use a local copy for evBufPos, so that evBufPos is at event boundary at any moment evBuf[curPos++] = eventType; diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeObjLiveness.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeObjLiveness.java index f2b28b8250..b30ae2f7f3 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeObjLiveness.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeObjLiveness.java @@ -221,7 +221,7 @@ public static void resetProfilerCollectors() { // epoch counter are reported after this event, which may confuse the tool. So we keep the ever-growing epoch counter. //GC.resetGCEpochCounter(); - // TODO [ian] - check this furhter - it was reported by Jon Christianssen that objects with high surviving gen + // TODO [ian] - check this further - it was reported by Jon Christianssen that objects with high surviving gen // numbers were reported after resetting the results, which he (rightfully so) considered wrong } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeSampler.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeSampler.java index 3dde733fa8..d315996b82 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeSampler.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerRuntimeSampler.java @@ -58,7 +58,7 @@ class ProfilerRuntimeSampler extends ProfilerRuntime { private static Sampling sampling; private static int samplingFrequency = 10; - static void setSamplngFrequency(int v) { + static void setSamplingFrequency(int v) { samplingFrequency = v; } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerServer.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerServer.java index 12912e6fd9..317ea112ea 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerServer.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/server/ProfilerServer.java @@ -626,7 +626,7 @@ public static void main(String[] args) { status.targetAppRunning = false; ProfilerInterface.disableProfilerHooks(); // So that e.g. System.exit() doesn't cause class loads and command sends // DEBUGGING: if it's needed to check how good is the sampling interval when sampled instrumentation is used, - // decomment the one below to make the sampling thread stop here and report the debug data. + // uncomment the one below to make the sampling thread stop here and report the debug data. // ProfilerRuntimeCPUSampledInstr.clearDataStructures(); profilerServer.sendSimpleCmdToClient(Command.SHUTDOWN_INITIATED); @@ -789,7 +789,7 @@ static ResourceBundle getProfilerServerResourceBundle() { // cannot find jfluid-server.jar or Bundle.properties not found if (messages != null) { - return messages; // ResourceBundle successfuly loaded using custom classloader + return messages; // ResourceBundle successfully loaded using custom classloader } // 2. try to get the ResourceBundle in standard way @@ -1478,7 +1478,7 @@ public void run() { ProfilerRuntimeCPU.setNProfiledThreadsLimit(scipCmd.getNProfiledThreadsLimit()); ProfilerRuntimeCPU.setStackDepthLimit(scipCmd.getStackDepthLimit()); ProfilerRuntimeCPUSampledInstr.setSamplingInterval(scipCmd.getSamplingInterval()); - ProfilerRuntimeSampler.setSamplngFrequency(scipCmd.getThreadsSamplingFrequency()); + ProfilerRuntimeSampler.setSamplingFrequency(scipCmd.getThreadsSamplingFrequency()); ProfilerRuntimeMemory.setSamplingInterval((short) scipCmd.getObjAllocStackSamplingInterval()); ProfilerRuntimeMemory.setStackSamplingDepth(scipCmd.getObjAllocStackSamplingDepth()); ProfilerRuntimeObjLiveness.setRunGCOnGetResults(scipCmd.getRunGCOnGetResultsInMemoryProfiling()); diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/MiscUtils.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/MiscUtils.java index a72a4c05fd..1d089ade6e 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/MiscUtils.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/MiscUtils.java @@ -501,7 +501,7 @@ public static boolean containsDirectoryOnPath(String directory, String path) { } public static void deleteHeapTempFiles() { - if (Platform.isWindows()) { // this is workaroud for JDK bug #6359560 + if (Platform.isWindows()) { // this is workaround for JDK bug #6359560 try { File tempDir = new File(System.getProperty("java.io.tmpdir")); // NOI18N diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/StringUtils.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/StringUtils.java index f02f066cd8..8a1b456a36 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/StringUtils.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/StringUtils.java @@ -147,7 +147,7 @@ public static String formatFullDate(Date date) { } /** Formats provided time/date in a form that is tuned for user wrt to space needed and clarity/usefulness. - * It compareses the time/date passed against current time, and decides from one of 5 formats: + * It compares the time/date passed against current time, and decides from one of 5 formats: * - if the time is today, format it just using the time hh:mm:ss AM/PM * - if the time is yesterday, format is as Yesterday, hh:mm AM/PM * - if the time is this week, format is as [Name of Day], hh:mm AM/PM diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/formatting/PlainFormattableMethodName.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/formatting/PlainFormattableMethodName.java index 66fa965abc..97351b7974 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/formatting/PlainFormattableMethodName.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/utils/formatting/PlainFormattableMethodName.java @@ -100,7 +100,7 @@ public class PlainFormattableMethodName implements Formattable { this.className = ""; // NOI18N } - if (this.className.length() == 0) { // deafult package wildcard + if (this.className.length() == 0) { // default package wildcard this.className = ".*"; // NOI18N } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/GetClassFileBytesCommand.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/GetClassFileBytesCommand.java index f3a57dc44f..08eea88004 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/GetClassFileBytesCommand.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/GetClassFileBytesCommand.java @@ -61,7 +61,7 @@ public GetClassFileBytesCommand(String[] classes, int[] classLoaderIds) { this.classLoaderIds = classLoaderIds; } - // Custom serializaion support + // Custom serialization support GetClassFileBytesCommand() { super(GET_CLASS_FILE_BYTES); } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InitiateProfilingCommand.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InitiateProfilingCommand.java index 37d7be90d9..4fa3b7717f 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InitiateProfilingCommand.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InitiateProfilingCommand.java @@ -107,7 +107,7 @@ public InitiateProfilingCommand(int instrType) { this(instrType,null); } - // Custom serialzation support + // Custom serialization support InitiateProfilingCommand() { super(INITIATE_PROFILING); } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupCommand.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupCommand.java index e7f57341c7..422a40cba9 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupCommand.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupCommand.java @@ -77,7 +77,7 @@ public InstrumentMethodGroupCommand(Object dummy) { instrType = -1; } - // Custom serializaion support + // Custom serialization support InstrumentMethodGroupCommand() { super(INSTRUMENT_METHOD_GROUP); b = new InstrumentMethodGroupData(); diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupData.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupData.java index 8ee6c176b2..0271ef5e83 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupData.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupData.java @@ -80,7 +80,7 @@ public InstrumentMethodGroupData(String[] instrMethodClasses, int[] instrMethodC this.addInfo = addInfo; } - // Custom serializaion support + // Custom serialization support InstrumentMethodGroupData() { } diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupResponse.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupResponse.java index da283ead2e..cc6c3f7c5f 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupResponse.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/InstrumentMethodGroupResponse.java @@ -74,7 +74,7 @@ public InstrumentMethodGroupResponse(Object dummy) { super(false, INSTRUMENT_METHOD_GROUP); } - // Custom serializaion support + // Custom serialization support InstrumentMethodGroupResponse() { super(INSTRUMENT_METHOD_GROUP); b = new InstrumentMethodGroupData(); diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/MonitoredNumbersResponse.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/MonitoredNumbersResponse.java index 4bde9a78a2..720f744a61 100644 --- a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/MonitoredNumbersResponse.java +++ b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/MonitoredNumbersResponse.java @@ -75,7 +75,7 @@ public class MonitoredNumbersResponse extends Response { //~ Instance fields ---------------------------------------------------------------------------------------------------------- - private long[] gcFinishs; + private long[] gcFinishes; private long[] gcStarts; private long[] generalNumbers = new long[GENERAL_NUMBERS_SIZE]; private String[] newThreadClassNames; @@ -136,8 +136,8 @@ public void setExplicitDataOnThreads(int[] explicitThreads, byte[] explicitState this.exactTimeStamps = explicitTimeStamps; } - public long[] getGCFinishs() { - return gcFinishs; + public long[] getGCFinishes() { + return gcFinishes; } public long[] getGCStarts() { @@ -146,7 +146,7 @@ public long[] getGCStarts() { public void setGCstartFinishData(long[] start, long[] finish) { gcStarts = start; - gcFinishs = finish; + gcFinishes = finish; } public long[] getGeneralMonitoredNumbers() { @@ -286,14 +286,14 @@ void readObject(ObjectInputStream in) throws IOException { } arrSize = in.readInt(); - gcFinishs = new long[arrSize]; + gcFinishes = new long[arrSize]; for (int i = 0; i < arrSize; i++) { - gcFinishs[i] = in.readLong(); + gcFinishes[i] = in.readLong(); } Arrays.sort(gcStarts); - Arrays.sort(gcFinishs); + Arrays.sort(gcFinishes); serverState = in.readInt(); serverProgress = in.readInt(); @@ -343,10 +343,10 @@ void writeObject(ObjectOutputStream out) throws IOException { out.writeLong(gcStarts[i]); } - out.writeInt(gcFinishs.length); + out.writeInt(gcFinishes.length); - for (int i = 0; i < gcFinishs.length; i++) { - out.writeLong(gcFinishs[i]); + for (int i = 0; i < gcFinishes.length; i++) { + out.writeLong(gcFinishes[i]); } out.writeInt(serverState); diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build-before-profiler.xml b/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build-before-profiler.xml index 914fd6f14f..6fc80ba757 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build-before-profiler.xml +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build-before-profiler.xml @@ -25,7 +25,7 @@ -pre-compile-test: called before javac compilation of JUnit tests -post-compile-test: called after javac compilation of JUnit tests -pre-compile-test-single: called before javac compilation of single JUnit test - -post-compile-test-single: called after javac compilation of single JUunit test + -post-compile-test-single: called after javac compilation of single JUnit test -pre-jar: called before JAR building -post-jar: called after JAR building -post-clean: called after cleaning build products diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml b/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml index 93e129e040..91ca0806ac 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/j2se-simple/build.xml @@ -26,7 +26,7 @@ -pre-compile-test: called before javac compilation of JUnit tests -post-compile-test: called after javac compilation of JUnit tests -pre-compile-test-single: called before javac compilation of single JUnit test - -post-compile-test-single: called after javac compilation of single JUunit test + -post-compile-test-single: called after javac compilation of single JUnit test -pre-jar: called before JAR building -post-jar: called after JAR building -post-clean: called after cleaning build products diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/jbb/config.properties b/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/jbb/config.properties index 1e7d5d694f..01b5a66964 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/jbb/config.properties +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/data/projects/jbb/config.properties @@ -28,7 +28,7 @@ # increment by 1 and go to at least 8 warehouses # The expected_peak_warehouses defaults to the result of the runtime call # Runtime.getRuntime.availableProcessors() -# It can be overeridden here but then a submission should include an explanation +# It can be overridden here but then a submission should include an explanation # in the Notes field input.jvm_instances=1 input.starting_number_warehouses=1 diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/CommonProfilerTestCase.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/CommonProfilerTestCase.java index 4f4d814821..b9c8d586f5 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/CommonProfilerTestCase.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/CommonProfilerTestCase.java @@ -515,7 +515,7 @@ protected void finalizeTest(TargetAppRunner runner) { assertFalse("Target JVM is running after finish", runner.targetJVMIsAlive()); - //test the profiled proces is finished + //test the profiled process is finished if (profilingProcess != null) { try { profilingProcess.waitFor(); @@ -599,7 +599,7 @@ protected Process startTargetVM(TargetAppRunner runner) { commands.add("-XX:+ShowMessageBoxOnError"); // NOI18N } - //classptah + //classpath commands.add("-classpath"); commands.add(settings.getMainClassPath()); @@ -683,7 +683,7 @@ protected void storeSettings(ProfilerEngineSettings settings, HashMap map) { map.put("profiler.settings.override.jvm.args", toString(settings.getJVMArgs())); map.put("profiler.settings.override.port.no", Integer.toString(settings.getPortNo())); map.put("profiler.settings.thread.cpu.timer.on", Boolean.toString(settings.getThreadCPUTimerOn())); - map.put("profiler.settings.istrument.getter.setter.methods", Boolean.toString(settings.getInstrumentGetterSetterMethods())); + map.put("profiler.settings.instrument.getter.setter.methods", Boolean.toString(settings.getInstrumentGetterSetterMethods())); map.put("profiler.settings.instrument.empty.methods", Boolean.toString(settings.getInstrumentEmptyMethods())); map.put("profiler.settings.instrument.method.invoke", Boolean.toString(settings.getInstrumentMethodInvoke())); map.put("profiler.settings.instrument.spawned.threads", Boolean.toString(settings.getInstrumentSpawnedThreads())); @@ -736,10 +736,10 @@ protected void storeSettings(ProfilerEngineSettings settings, HashMap map) { } } - map.put("profiler.settings.istrumentation.root.methods-", sb.toString()); //prefix + map.put("profiler.settings.instrumentation.root.methods-", sb.toString()); //prefix } else { map.put("profiler.settings.instrumentation.root.methods.size", "0"); - map.put("profiler.settings.istrumentation.root.methods-", ""); + map.put("profiler.settings.instrumentation.root.methods-", ""); } } diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/benchmarks/JbbTestType.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/benchmarks/JbbTestType.java index 4b2a22299b..25e5861532 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/benchmarks/JbbTestType.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/benchmarks/JbbTestType.java @@ -107,7 +107,7 @@ protected int[] checkResults(File workdir) { return null; } - protected void evalueateResults(int[] without, int[] with, int maxSlowdown) { + protected void evaluateResults(int[] without, int[] with, int maxSlowdown) { double[] diffs = new double[with.length]; for (int i = 0; i < diffs.length; i++) { @@ -204,7 +204,7 @@ protected void startBenchmarkTest(ProfilerEngineSettings settings, int maxSlowdo waitForStatus(STATUS_RUNNING); assertTrue("runner is not running", runner.targetAppIsRunning()); - ArrayList metods = new ArrayList(); + ArrayList methods = new ArrayList(); long checkDelay = 1500; while (!isStatus(STATUS_APP_FINISHED) && !isStatus(STATUS_ERROR)) { @@ -218,7 +218,7 @@ protected void startBenchmarkTest(ProfilerEngineSettings settings, int maxSlowdo log("finish ****************************** " + getStatus()); int[] res2 = checkResults(workdir); - evalueateResults(res1, res2, maxSlowdown); + evaluateResults(res1, res2, maxSlowdown); } catch (Exception ex) { log(ex); assertTrue("Exception thrown: " + ex.getMessage(), false); diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/cpu/BasicTest.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/cpu/BasicTest.java index 9441924a5d..478a589fca 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/cpu/BasicTest.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/cpu/BasicTest.java @@ -78,7 +78,7 @@ public class BasicTest extends CPUTestCase { "testMethodWithWaitTotal", "testMethodWithWaitTotalServer", "testSettingsDefault", // not stable - "testSettingsInstrumenManyMethodsLazy", + "testSettingsInstrumentManyMethodsLazy", "testSettingsInstrumentAllEager", "testSettingsInstrumentAllEagerServer", "testSettingsInstrumentAllLazy", @@ -135,7 +135,7 @@ public static Test suite() { "testMethodWithWaitTotal", "testMethodWithWaitTotalServer", "testSettingsDefault", -// "testSettingsInstrumenManyMethodsLazy", JVM crash +// "testSettingsInstrumentManyMethodsLazy", JVM crash "testSettingsInstrumentAllEager", "testSettingsInstrumentAllEagerServer", "testSettingsInstrumentAllLazy", @@ -266,7 +266,7 @@ public void testSettingsDefault() { }, new long[]{20L, 100L, 1000L, 512L}, 40.0, new String[]{"simple"}, ALL_INV_ERROR_METHOD); } - public void testSettingsInstrumenManyMethodsLazy() { + public void testSettingsInstrumentManyMethodsLazy() { temptestSettingsInstrumentManyMethods(CommonConstants.INSTRSCHEME_LAZY); } diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/cpu/CPUTestCase.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/cpu/CPUTestCase.java index 4c278cf689..7614450935 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/cpu/CPUTestCase.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/cpu/CPUTestCase.java @@ -198,7 +198,7 @@ protected void checkCPUResults(FlatProfileContainer fpc, HashMap methods, String if ((tm > m.time) || (inv > m.invocations)) { log("\n!!!Decreasing values: method " + fpc.getMethodNameAtRow(row) + " current time " + m.time + " invocations " + m.invocations + " but was time=" + tm + " invocations=" + inv + "\n"); - assertFalse("Unacceptable results - decresing values (issue 65187)", true); + assertFalse("Unacceptable results - decreasing values (issue 65187)", true); } } } @@ -362,7 +362,7 @@ protected void startCPUTest(ProfilerEngineSettings settings, String[] measuredMe int retryCounter = 8; // was - 4 do { - // just wait for the results to appear - forceObtainedResultsDump() has been alread called by ProfilerClient on shutdown + // just wait for the results to appear - forceObtainedResultsDump() has been already called by ProfilerClient on shutdown // runner.getProfilerClient().forceObtainedResultsDump(); gotResults = resultListener.wait4results(2500); } while (!gotResults && (--retryCounter > 0)); @@ -407,7 +407,7 @@ protected void startCPUTest(ProfilerEngineSettings settings, String[] measuredMe } /** - * check reulsts periodicaly - live results + * check results periodically - live results */ protected void startCPUTest(ProfilerEngineSettings settings, String[] measuredMethodsFilter, long checkDelay, long maxDelay) { CPUCallGraphBuilder builder = new CPUCallGraphBuilder(); diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/memory/MemorySnapshotTestCase.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/memory/MemorySnapshotTestCase.java index b116213f0f..4f44999c5d 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/memory/MemorySnapshotTestCase.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/memory/MemorySnapshotTestCase.java @@ -151,11 +151,11 @@ protected void checkClasses(MemoryResultsSnapshot snapshot, String[] prefixes) { ArrayList list = new ArrayList(128); if (snapshot instanceof AllocMemoryResultsSnapshot) { - AllocMemoryResultsSnapshot alsnapshot = (AllocMemoryResultsSnapshot) snapshot; + AllocMemoryResultsSnapshot alSnapshot = (AllocMemoryResultsSnapshot) snapshot; - int[] objcnts = alsnapshot.getObjectsCounts(); - long[] objsizes = alsnapshot.getObjectsSizePerClass(); - String[] classnames = alsnapshot.getClassNames(); + int[] objcnts = alSnapshot.getObjectsCounts(); + long[] objsizes = alSnapshot.getObjectsSizePerClass(); + String[] classnames = alSnapshot.getClassNames(); for (int i = 0; i < snapshot.getNProfiledClasses(); i++) { boolean match = false; @@ -188,7 +188,7 @@ protected void checkClasses(MemoryResultsSnapshot snapshot, String[] prefixes) { log("Tracked bytes: " + lsnapshot.getNTotalTrackedBytes()); log("Tracked items: " + lsnapshot.getNTrackedItems()); - float[] avgage = lsnapshot.getAvgObjectAge(); + float[] avgObjAge = lsnapshot.getAvgObjectAge(); int[] maxSurvGen = lsnapshot.getMaxSurvGen(); long[] ntrackedallocobjects = lsnapshot.getNTrackedAllocObjects(); int[] ntrackedliveobjects = lsnapshot.getNTrackedLiveObjects(); @@ -213,7 +213,7 @@ protected void checkClasses(MemoryResultsSnapshot snapshot, String[] prefixes) { //out.append(complete(StringUtils.nBytesToString(trackedLiveObjectsSize[i]), 10)); out.append(complete(String.valueOf(ntrackedliveobjects[i]), 10)); out.append(complete(String.valueOf(ntrackedallocobjects[i]), 8)); - //out.append(complete(String.valueOf((int)avgage[i]), 8)); + //out.append(complete(String.valueOf((int)avgObjAge[i]), 8)); //out.append(complete(String.valueOf(maxSurvGen[i]), 8)); out.append(complete(String.valueOf(totalAllocObjects[i]), 8)); list.add(out.toString()); diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/memory/MemoryTestCase.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/memory/MemoryTestCase.java index 29364e9286..4dad88c31f 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/memory/MemoryTestCase.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/memory/MemoryTestCase.java @@ -180,7 +180,7 @@ protected void checkMemoryResults(TargetAppRunner targetAppRunner, String[] matc totalAllocObjectsSize = liveness.trackedLiveObjectsSize; - float[] avgage = liveness.avgObjectAge; + float[] avgObjAge = liveness.avgObjectAge; int[] maxSurvGen = liveness.maxSurvGen; long[] ntrackedallocobjects = liveness.nTrackedAllocObjects; int[] ntrackedliveobjects = liveness.nTrackedLiveObjects; @@ -202,7 +202,7 @@ protected void checkMemoryResults(TargetAppRunner targetAppRunner, String[] matc //out.append(complete(StringUtils.nBytesToString(totalAllocObjectsSize[i]), 10)); out.append(complete(String.valueOf(ntrackedliveobjects[i]), 10)); out.append(complete(String.valueOf(ntrackedallocobjects[i]), 8)); - //out.append(complete(String.valueOf((int)avgage[i]), 8)); + //out.append(complete(String.valueOf((int)avgObjAge[i]), 8)); //out.append(complete(String.valueOf(maxSurvGen[i]), 8)); list.add(out.toString()); } diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/monitor/MonitorTestCase.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/monitor/MonitorTestCase.java index 8ef6958cf2..86de761b7b 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/monitor/MonitorTestCase.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/monitor/MonitorTestCase.java @@ -235,8 +235,8 @@ protected void startMonitorTest(ProfilerEngineSettings settings, int times, long assertTrue("Threads manager has not data", threadsManager.hasData()); int statesNumber = 128; - long deltat = threadsManager.getEndTime() - threadsManager.getStartTime(); - double tick = (double) deltat / (double) statesNumber; + long delta = threadsManager.getEndTime() - threadsManager.getStartTime(); + double tick = (double) delta / (double) statesNumber; ArrayList names = new ArrayList(); for (int i = 0; i < threadsManager.getThreadsCount(); i++) { diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/others/MeasureDiffsTestCase.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/others/MeasureDiffsTestCase.java index 8d21a39e98..7486530a22 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/others/MeasureDiffsTestCase.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/others/MeasureDiffsTestCase.java @@ -82,8 +82,8 @@ class Results { //~ Instance fields ------------------------------------------------------------------------------------------------------ double ideal; - double measalone; - double measprofiler; + double measuredAlone; + double measuredProfiler; double profiled; //~ Methods -------------------------------------------------------------------------------------------------------------- @@ -97,14 +97,14 @@ public void setIdeal(String val) { public void setMeasuredAlone(String val) { try { - measalone = Double.parseDouble(val); + measuredAlone = Double.parseDouble(val); } catch (NumberFormatException ex) { } } public void setMeasuredProfiled(String val) { try { - measprofiler = Double.parseDouble(val); + measuredProfiler = Double.parseDouble(val); } catch (NumberFormatException ex) { } } @@ -114,7 +114,7 @@ public void setProfiled(double val) { } public String toString() { - return String.valueOf(ideal) + ";" + String.valueOf(measalone) + ";" + String.valueOf(measprofiler) + ";" + return String.valueOf(ideal) + ";" + String.valueOf(measuredAlone) + ";" + String.valueOf(measuredProfiler) + ";" + String.valueOf(profiled); } } diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/profilingpoints/BasicTest.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/profilingpoints/BasicTest.java index 8b9729d2fd..b39ccbbe8e 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/profilingpoints/BasicTest.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/profilingpoints/BasicTest.java @@ -82,7 +82,7 @@ public void testSimpleBlock() { startPPStopwatchTest(settings, new StopWatchPP[] {new StopWatchPP("simple.cpu.Region", 27, 29, 20)}); }*/ - // public void testEmpytBlock() { + // public void testEmptyBlock() { // ProfilerEngineSettings settings = initPPTest("j2se-simple", "simple.cpu.Region", null); // startPPStopwatchTest(settings, new StopWatchPP[] {new StopWatchPP("simple.cpu.Region", 33, 34, 20)}); // } diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/profilingpoints/ProfilingPointsTestCase.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/profilingpoints/ProfilingPointsTestCase.java index ef0f8bd32f..483fb4a506 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/profilingpoints/ProfilingPointsTestCase.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/profilingpoints/ProfilingPointsTestCase.java @@ -168,7 +168,7 @@ public ProfilingPointsTestCase(String name) { // return points; // } // /* - // protected void startPPTest(ProfilerEngineSettings settings, String crClasse, + // protected void startPPTest(ProfilerEngineSettings settings, String crClasses, // String crMethod, String crSignature, long idealTime, double diffPercent) { // //create runner // @@ -177,7 +177,7 @@ public ProfilingPointsTestCase(String name) { // try { // runner.readSavedCalibrationData(); // //create selection - // SourceCodeSelection select = new SourceCodeSelection(crClasse, crMethod, crSignature); + // SourceCodeSelection select = new SourceCodeSelection(crClasses, crMethod, crSignature); // runner.getProfilerClient().initiateCodeRegionInstrumentation(select); // // //measureCR(runner, idealTime, diffPercent); @@ -190,7 +190,7 @@ public ProfilingPointsTestCase(String name) { // }*/ // // static int counts = 0; - // static int counte = 0; + // static int counter = 0; // // HashMap> hits = new HashMap(32); // @@ -210,7 +210,7 @@ public ProfilingPointsTestCase(String name) { // // class StopStopwatch implements ProfilingPoint.Executor { // public void profilePointHit(HitEvent event) { - // System.out.println("end id "+counte++); + // System.out.println("end id "+counter++); // StopWatchPP stopwatch = stopwatches.get(event.getId()); // HashMap map = hits.get(stopwatch); // if (map != null && map.get(event.getThreadId()) != null) { diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/utils/TestProfilerAppHandler.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/utils/TestProfilerAppHandler.java index b31f71c9d2..2f76707d7d 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/utils/TestProfilerAppHandler.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/utils/TestProfilerAppHandler.java @@ -70,7 +70,7 @@ public boolean confirmWaitForConnectionReply() { public void displayError(String msg) { test.log("\n!!!error"); - test.log("mesage=" + msg); + test.log("message=" + msg); test.getLog().flush(); System.err.println("Error: " + msg); new Exception().printStackTrace(); @@ -80,7 +80,7 @@ public void displayError(String msg) { public void displayErrorAndWaitForConfirm(String msg) { test.getLog().flush(); test.log("error"); - test.log("mesg=" + msg); + test.log("message=" + msg); System.err.println("Error: " + msg); new Exception().printStackTrace(); test.setStatus(CommonProfilerTestCase.STATUS_ERROR); @@ -89,7 +89,7 @@ public void displayErrorAndWaitForConfirm(String msg) { public void displayErrorWithDetailsAndWaitForConfirm(String shortMsg, String detailsMsg) { test.getLog().flush(); test.log("error"); - test.log("mesg=" + shortMsg); + test.log("message=" + shortMsg); test.log("details=" + detailsMsg); System.err.println("Error: " + shortMsg + "; Details: " + detailsMsg); new Exception().printStackTrace(); diff --git a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/wireio/BasicTest.java b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/wireio/BasicTest.java index 6c6a1d2b36..c34660ab1e 100644 --- a/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/wireio/BasicTest.java +++ b/visualvm/libs.profiler/lib.profiler/test/qa-functional/src/org/graalvm/visualvm/lib/jfluid/tests/jfluid/wireio/BasicTest.java @@ -189,7 +189,7 @@ public void testComplexResponse() { log("send response " + resp); wireIO.sendComplexResponse(resp); - // Testing VMProperties against a golden file may fail because of different environemtn; ommiting this response + // Testing VMProperties against a golden file may fail because of different environment; omitting this response // resp = new VMPropertiesResponse( // System.getProperty("java.version"), // NOI18N // System.getProperty("java.class.path"), // NOI18N diff --git a/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/HeapTest.java b/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/HeapTest.java index 7a1c3b0909..5724d95c97 100644 --- a/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/HeapTest.java +++ b/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/HeapTest.java @@ -276,7 +276,7 @@ public void testHeapDumpLog() throws IOException, URISyntaxException { System.out.println("testHeapDumpLog"); File outFile = File.createTempFile("testHeapDumpLog", ".txt"); URL url = getClass().getResource("testHeapDumpLog.txt"); - File goledFile = new File(url.toURI()); + File goldenFile = new File(url.toURI()); OutputStream outs = new FileOutputStream(outFile); PrintStream out = new PrintStream(new BufferedOutputStream(outs,128*1024),false,"UTF-8"); HeapSummary summary = heap.getSummary(); @@ -384,12 +384,12 @@ public void testHeapDumpLog() throws IOException, URISyntaxException { out.println("Root kind "+root.getKind()+" Class "+i.getJavaClass().getName()+"#"+i.getInstanceNumber()); } out.close(); - compareTextFiles(goledFile,outFile); + compareTextFiles(goldenFile,outFile); outFile.delete(); } - private void compareTextFiles(File goledFile, File outFile) throws IOException { - InputStreamReader goldenIsr = new InputStreamReader(new FileInputStream(goledFile),"UTF-8"); + private void compareTextFiles(File goldenFile, File outFile) throws IOException { + InputStreamReader goldenIsr = new InputStreamReader(new FileInputStream(goldenFile),"UTF-8"); LineNumberReader goldenReader = new LineNumberReader(goldenIsr); InputStreamReader isr = new InputStreamReader(new FileInputStream(outFile),"UTF-8"); LineNumberReader reader = new LineNumberReader(isr); @@ -400,6 +400,6 @@ private void compareTextFiles(File goledFile, File outFile) throws IOException { goldenLine = goldenReader.readLine(); line = reader.readLine(); } - assertEquals("File "+goledFile.getAbsolutePath()+" and "+outFile.getAbsolutePath()+" differs on line "+goldenReader.getLineNumber(), goldenLine, line); + assertEquals("File "+goldenFile.getAbsolutePath()+" and "+outFile.getAbsolutePath()+" differs on line "+goldenReader.getLineNumber(), goldenLine, line); } } diff --git a/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/small_heap.bin b/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/small_heap.bin index 2f49945a50..ad841ca8f7 100644 Binary files a/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/small_heap.bin and b/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/small_heap.bin differ diff --git a/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/testHeapDumpLog.txt b/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/testHeapDumpLog.txt index d48491da73..90278de1ab 100644 --- a/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/testHeapDumpLog.txt +++ b/visualvm/libs.profiler/lib.profiler/test/unit/src/org/graalvm/visualvm/lib/jfluid/heap/testHeapDumpLog.txt @@ -2405,7 +2405,7 @@ sun.cpu.isalist Id 0x6c939b40 Class java.lang.Class SuperClass java.lang.Object Instance size 84 Instance count 9 All Instances Size 756 Static Field name EMPTY_ANNOTATIONS_ARRAY type object value 1684080432 Ref object java.lang.annotation.Annotation[]#1 - Static Field name initted type boolean value true + Static Field name inited type boolean value true Static Field name reflectionFactory type object value 1684080984 Ref object sun.reflect.ReflectionFactory#1 Static Field name serialPersistentFields type object value 1684080416 @@ -15712,7 +15712,7 @@ sun.cpu.isalist Ref object sun.reflect.ReflectionFactory#1 Static Field name reflectionFactoryAccessPerm type object value 1684080960 Ref object java.lang.RuntimePermission#2 - Static Field name initted type boolean value true + Static Field name inited type boolean value true Static Field name type object value 0 Instance Id 0x64610958 number 1 retained size 8 References count 4 diff --git a/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/JavaPlatform.java b/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/JavaPlatform.java index 6ef6d02425..01d81b2f80 100644 --- a/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/JavaPlatform.java +++ b/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/JavaPlatform.java @@ -68,7 +68,7 @@ public final class JavaPlatform { /** * finds platform with specified platform id. * @param platformId unique id of the platform - * @return platform which has plarformId as unique id + * @return platform which has platformId as unique id * or null if the is no such platform */ public static JavaPlatform getJavaPlatformById(String platformId) { @@ -84,7 +84,7 @@ public static JavaPlatform getJavaPlatformById(String platformId) { return null; } - /** Gets an list of JavaPlatfrom objects suitable for profiling. + /** Gets an list of JavaPlatform objects suitable for profiling. * @return the array of java platform definitions. */ public static List getPlatforms() { diff --git a/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/icons/LanguageIcons.java b/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/icons/LanguageIcons.java index 344a22e55f..9b921dbf16 100644 --- a/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/icons/LanguageIcons.java +++ b/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/icons/LanguageIcons.java @@ -82,5 +82,5 @@ public interface LanguageIcons extends Icons.Keys { public static final String ARRAY = "LanguageIcons.Array"; // NOI18N public static final String INSTANCE = "LanguageIcons.Instance"; // NOI18N public static final String PRIMITIVE = "LanguageIcons.Primitive"; // NOI18N - public static final String JAR = "LanguangeIcons.Jar"; // NOI18N + public static final String JAR = "LanguageIcons.Jar"; // NOI18N } diff --git a/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/java/ExternalPackages.java b/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/java/ExternalPackages.java index 778407bcce..17435fd2ee 100644 --- a/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/java/ExternalPackages.java +++ b/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/java/ExternalPackages.java @@ -51,7 +51,7 @@ /** * - * @author Jaroslv Bachorik + * @author Jaroslav Bachorik */ final public class ExternalPackages { private static final Comparator pathComparator = new Comparator() { @@ -162,7 +162,7 @@ public FileObject getFile() { } @Override - public Set getInnerClases() { + public Set getInnerClasses() { Set rslt = new HashSet(); ClassFileParser cfp = new ClassFileParser(); Enumeration siblings = clazz.getParent().getData(false); @@ -248,7 +248,7 @@ public Set getSubclasses() { } @Override - public Set getInnerClases() { + public Set getInnerClasses() { return Collections.EMPTY_SET; } diff --git a/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/java/SourceClassInfo.java b/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/java/SourceClassInfo.java index 00ef66c523..028be1563f 100644 --- a/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/java/SourceClassInfo.java +++ b/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/api/java/SourceClassInfo.java @@ -128,7 +128,7 @@ public boolean isAnonymous() { abstract public FileObject getFile(); abstract public Set getMethods(boolean all); abstract public Set getSubclasses(); - abstract public Set getInnerClases(); + abstract public Set getInnerClasses(); abstract public Set getConstructors(); abstract public SourceClassInfo getSuperType(); abstract public Set getInterfaces(); diff --git a/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/spi/LoadGenPlugin.java b/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/spi/LoadGenPlugin.java index 966cbdfeae..11a8cb33c1 100644 --- a/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/spi/LoadGenPlugin.java +++ b/visualvm/libs.profiler/profiler.api/src/org/graalvm/visualvm/lib/profiler/spi/LoadGenPlugin.java @@ -123,12 +123,12 @@ public static enum Result {//~ Enumeration constant initializers --------------- void start(String scriptPath, Callback callback); /** - * Stops the last successfuly started load generator process + * Stops the last successfully started load generator process */ void stop(); /** - * Stops a load generator process givent the script path that started it + * Stops a load generator process given the script path that started it * @param scriptPath The path to the loadgen script */ void stop(String scriptPath); diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/AnalysisController.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/AnalysisController.java index a09c477a91..8ca08533ac 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/AnalysisController.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/AnalysisController.java @@ -149,7 +149,7 @@ public void run() { AnalysisControllerUI ui = (AnalysisControllerUI)getPanel(); ui.displayNewRules(); - if (!ml.isInterruped()) ui.setResult(ml.getResults()); + if (!ml.isInterrupted()) ui.setResult(ml.getResults()); } }); diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ReferencesBrowserController.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ReferencesBrowserController.java index 0b2fdcf51d..4207de4f64 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ReferencesBrowserController.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/ReferencesBrowserController.java @@ -262,17 +262,17 @@ public void done() { progress.finish(); } - ReferencesBrowserControllerUI controlerUI = (ReferencesBrowserControllerUI) getPanel(); - HeapWalkerNode selNode = controlerUI.getSelectedNode(); + ReferencesBrowserControllerUI controllerUI = (ReferencesBrowserControllerUI) getPanel(); + HeapWalkerNode selNode = controllerUI.getSelectedNode(); if (selNode == null) { - selNode = controlerUI.getSelectedNode(0); + selNode = controllerUI.getSelectedNode(0); } if (instanceNode.equals(selNode)) { if (gcRootNode != null) { if (instanceNode == gcRootNode) { ProfilerDialogs.displayInfo(Bundle.ReferencesBrowserController_SelfGcRootMsg()); } else { - controlerUI.selectNode(gcRootNode); + controllerUI.selectNode(gcRootNode); } } else { ProfilerDialogs.displayInfo(Bundle.ReferencesBrowserController_NoGcRootMsg()); diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/IoDetailsProvider.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/IoDetailsProvider.java index 30127d44d8..31e62cf446 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/IoDetailsProvider.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/IoDetailsProvider.java @@ -88,7 +88,7 @@ public String getDetailsString(String className, Instance instance, Heap heap) { return DetailsUtils.getInstanceFieldString(instance, "name", heap); // NOI18N } else if (RAF_MASK.equals(className)) { // RandomAccessFile return DetailsUtils.getInstanceFieldString(instance, "path", heap); // NOI18N - } else if (FIS_MASK.equals(className)) { // FileInputStrea + } else if (FIS_MASK.equals(className)) { // FileInputStream return DetailsUtils.getInstanceFieldString(instance, "path", heap); // NOI18N } else if (FOS_MASK.equals(className)) { // FileOutputStream return DetailsUtils.getInstanceFieldString(instance, "path", heap); // NOI18N diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/MathDetailsProvider.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/MathDetailsProvider.java index 70698d43cc..a26abcf4c0 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/MathDetailsProvider.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/MathDetailsProvider.java @@ -58,15 +58,15 @@ @ServiceProvider(service=DetailsProvider.class) public final class MathDetailsProvider extends DetailsProvider.Basic { - private static final String BIG_INTEGRER_MASK = "java.math.BigInteger"; // NOI18N + private static final String BIG_INTEGER_MASK = "java.math.BigInteger"; // NOI18N private static final String BIG_DECIMAL_MASK = "java.math.BigDecimal"; // NOI18N public MathDetailsProvider() { - super(BIG_INTEGRER_MASK,BIG_DECIMAL_MASK); + super(BIG_INTEGER_MASK,BIG_DECIMAL_MASK); } public String getDetailsString(String className, Instance instance, Heap heap) { - if (BIG_INTEGRER_MASK.equals(className)) { + if (BIG_INTEGER_MASK.equals(className)) { BigInteger bint = getBigInteger(instance); if (bint != null) { @@ -81,9 +81,9 @@ public String getDetailsString(String className, Instance instance, Heap heap) { if (intCompact != Long.MIN_VALUE) { return BigDecimal.valueOf(intCompact, scale).toString(); } else { - Object bintInstace = instance.getValueOfField("intVal"); // NOI18N - if (bintInstace instanceof Instance) { - BigInteger bint = getBigInteger((Instance)bintInstace); + Object bintInstance = instance.getValueOfField("intVal"); // NOI18N + if (bintInstance instanceof Instance) { + BigInteger bint = getBigInteger((Instance)bintInstance); if (bint != null) { return new BigDecimal(bint, scale).toString(); diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/NetDetailsProvider.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/NetDetailsProvider.java index a8f2327f65..c75474ede3 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/NetDetailsProvider.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/NetDetailsProvider.java @@ -66,12 +66,12 @@ public final class NetDetailsProvider extends DetailsProvider.Basic { private static final String URL_CONN_MASK = "java.net.URLConnection+"; // NOI18N private static final String URI_MASK = "java.net.URI"; // NOI18N private static final String HTTP_COOKIE_MASK = "java.net.HttpCookie"; // NOI18N - private static final String INET_SOCKET_ADDRERSS = "java.net.InetSocketAddress+"; // NOI18N // NOI18N + private static final String INET_SOCKET_ADDRESS = "java.net.InetSocketAddress+"; // NOI18N // NOI18N public NetDetailsProvider() { super(URL_MASK, INET4_ADDRESS_MASK, INET6_ADDRESS_MASK, NETWORK_IF_MASK, IF_ADDRESS_MASK, URL_CONN_MASK, URI_MASK, HTTP_COOKIE_MASK, - INET_SOCKET_ADDRERSS); + INET_SOCKET_ADDRESS); } public String getDetailsString(String className, Instance instance, Heap heap) { @@ -197,7 +197,7 @@ public String getDetailsString(String className, Instance instance, Heap heap) { String value = DetailsUtils.getInstanceFieldString( instance, "value", heap); // NOI18N return name + "=" + value; // NOI18N - } else if (INET_SOCKET_ADDRERSS.equals(className)) { + } else if (INET_SOCKET_ADDRESS.equals(className)) { String host = DetailsUtils.getInstanceFieldString(instance, "hostname", heap); // NOI18N String address = DetailsUtils.getInstanceFieldString(instance, "addr", heap); // NOI18N int port = DetailsUtils.getIntFieldValue(instance, "port", -1); // NOI18N diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/image/ImageBuilder.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/image/ImageBuilder.java index 8f6ec9ce90..7ef0ea496f 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/image/ImageBuilder.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/image/ImageBuilder.java @@ -100,9 +100,9 @@ static Image buildImageInternal(Instance instance, Heap heap) throws FieldAccess return builder.convert(new FieldAccessor(heap, BUILDERS), instance); } - private static final InstanceBuilder TOOKIT_IMAGE_STRING_BUILDER = + private static final InstanceBuilder TOOLKIT_IMAGE_STRING_BUILDER = new InstanceBuilder.ReferringInstanceBuilder(String.class, "imagerep", "bimage"); - private static final InstanceBuilder TOOKIT_IMAGE_IMAGE_BUILDER = + private static final InstanceBuilder TOOLKIT_IMAGE_IMAGE_BUILDER = new InstanceBuilder.ReferringInstanceBuilder(Image.class, "imagerep", "bimage"); private static final InstanceBuilder IMAGE_ICON_STRING_BUILDER = new InstanceBuilder.ReferringInstanceBuilder(String.class, "image"); @@ -297,8 +297,8 @@ public DataBuffer convert(FieldAccessor fa, Instance instance) throws FieldAcces BUILDERS.register(DataBufferByte.class, false, BYTE_DATA_BUFFER_BUILDER); BUILDERS.register(DataBufferUShort.class, false, USHORT_DATA_BUFFER_BUILDER); BUILDERS.register(WritableRaster.class, true, WRITABLE_RASTER_BUILDER); - BUILDERS.register("sun.awt.image.ToolkitImage+", TOOKIT_IMAGE_STRING_BUILDER); - BUILDERS.register("sun.awt.image.ToolkitImage+", TOOKIT_IMAGE_IMAGE_BUILDER); + BUILDERS.register("sun.awt.image.ToolkitImage+", TOOLKIT_IMAGE_STRING_BUILDER); + BUILDERS.register("sun.awt.image.ToolkitImage+", TOOLKIT_IMAGE_IMAGE_BUILDER); BUILDERS.register(ImageIcon.class, true, IMAGE_ICON_STRING_BUILDER); BUILDERS.register(ImageIcon.class, true, IMAGE_ICON_IMAGE_BUILDER); BUILDERS.register(BufferedImage.class, true, BUFFERED_IMAGE_STRING_BUILDER); diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/Utils.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/Utils.java index a439e21aa9..e4a5decfef 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/Utils.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/jdk/ui/Utils.java @@ -193,7 +193,7 @@ static final class JPopupMenuImpl extends JPopupMenu { public void setVisible(boolean visible) {} public boolean isVisible() { return true; } - // Workarounds for best apperance of JPopupMenu preview + // Workarounds for best appearance of JPopupMenu preview public Component add(Component comp) { if (comp instanceof JComponent) ((JComponent)comp).setOpaque(false); diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java index aa71fe25c1..4a1e78f576 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java @@ -173,7 +173,7 @@ private String getDetailsStringImpl(String className, Instance instance, Heap he String sep; if (FILE_NAME.equals(className) || FOLDER_NAME.equals(className)) { - // FileObject on the disk - find correct file seperator + // FileObject on the disk - find correct file separator sep = getFileSeparator(heap); if (parentDetail.endsWith(sep)) { // do not duplicate separator diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Histogram.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Histogram.java index 51663c8ed8..dfe87699ab 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Histogram.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Histogram.java @@ -170,7 +170,7 @@ public void add(String key, T entry) { } } - public String toString(int treshold) { + public String toString(int threshold) { StringBuilder result = new StringBuilder(); long totalSize = 0; int totalCount = 0; @@ -179,7 +179,7 @@ public String toString(int treshold) { for (Map.Entry entry : bySize.entrySet()) { long size = entry.getValue().getSize(); - if (size > treshold) { + if (size > threshold) { result.append(entry.getKey()).append(": ").append(entry.getValue()).append("
"); // NOI18N } diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/IteratingRule.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/IteratingRule.java index 08b8612bac..9e130f03cd 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/IteratingRule.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/IteratingRule.java @@ -59,7 +59,7 @@ * An iterating rule is a rule that iterates through all instances of single * class and does some analysis over each instance. When such a Rule is based * on this helper class, the infrastructure can independently monitor - * the progress and also paralelize the task among available CPUs. + * the progress and also parallelize the task among available CPUs. * * Rules can override {@link #prepareRule(MemoryLint)} and {@link #summary()} * for preparation and finalization work, and must implement @@ -95,7 +95,7 @@ public final void perform() { count += cls.getInstancesCount(); } - if (context.isInterruped()) { + if (context.isInterrupted()) { return; } } @@ -112,7 +112,7 @@ public final void perform() { perform(inst); progress.setValue(progress.getValue() + 1); - if (context.isInterruped()) { + if (context.isInterrupted()) { return; } } diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/MemoryLint.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/MemoryLint.java index 6c5191fb15..2e1ad1c96b 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/MemoryLint.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/MemoryLint.java @@ -132,7 +132,7 @@ public Heap getHeap() { return heap; } - public boolean isInterruped() { + public boolean isInterrupted() { return interrupted; } @@ -140,9 +140,9 @@ public String getResults() { return results.toString(); } - /** Perform BFS of incomming references and find shortest one not from SDK + /** Perform BFS of incoming references and find shortest one not from SDK */ - public String getRootIncommingString(Instance in) { + public String getRootIncomingString(Instance in) { String temp = null; for (;;) { @@ -203,7 +203,7 @@ public void process(Collection rules) { r.perform(); results.append("


"); - if (isInterruped()) { + if (isInterrupted()) { break; } } diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Rule.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Rule.java index 1cb1601088..4bea281652 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Rule.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Rule.java @@ -78,7 +78,7 @@ public final String getDisplayName() { * The rule can provide a long description in the form of HTML page. * This method should directly return the HTML page content. * If there are any relative URLs in the html code (images, style sheet), - * they are interpretted as relative to the Rule's class file. + * they are interpreted as relative to the Rule's class file. * * @return the HTML description code or null if the rule has no * HTML description. diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Utils.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Utils.java index 1db72a6691..0301b54a1c 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Utils.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/Utils.java @@ -275,9 +275,9 @@ public static Set getRetainedSet(Instance in, Heap heap) { return getRetainedSet(Collections.singleton(in), heap); } - /** Perform BFS of incomming references and find shortest one not from SDK + /** Perform BFS of incoming references and find shortest one not from SDK */ - public static String getRootIncommingString(Instance in) { + public static String getRootIncomingString(Instance in) { String temp = null; for (;;) { @@ -305,8 +305,8 @@ public static String getRootIncommingString(Instance in) { return (temp == null) ? "unknown" : temp; } - // Perform BFS of incomming references and find shortest one not from SDK - public static String getSignificantIncommingString(Instance in) { + // Perform BFS of incoming references and find shortest one not from SDK + public static String getSignificantIncomingString(Instance in) { Set processed = new HashSet(); String temp = null; Deque fifo = new ArrayDeque(); @@ -314,7 +314,7 @@ public static String getSignificantIncommingString(Instance in) { while (!fifo.isEmpty()) { if (fifo.size() > 10) { - Logger.getLogger(Utils.class.getName()).log(Level.FINE, "overflow in getSignificantIncommingString({0})", new Object[] { in }); + Logger.getLogger(Utils.class.getName()).log(Level.FINE, "overflow in getSignificantIncomingString({0})", new Object[] { in }); break; } diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/Bundle.properties b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/Bundle.properties index 0ea5ec0f35..84943d031c 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/Bundle.properties +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/Bundle.properties @@ -70,7 +70,7 @@ FMT_OverStr_Result=Wasted {0}B on overallocated Strings
LBL_RSBC_Name=Retained sets by class histograms LBL_RSBC_Desc=Prints histogram of retained set held by every class LBL_RSBC_LongDesc=Warning!

This rule takes a long \ -time to compute and can use a big amout of memory on large heaps! +time to compute and can use a big amount of memory on large heaps! LBL_RSBI_Name=Histograms of retained sets LBL_RSBI_Desc=Prints histogram of retained set held by instances of class diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/CollapsedHashMap.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/CollapsedHashMap.java index 2c62fb2d0e..225b7331be 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/CollapsedHashMap.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/CollapsedHashMap.java @@ -89,7 +89,7 @@ private class HMRecord { public String toString() { boolean reallyBad = slots == 1; return Bundle.FMT_CHM_Record( - Utils.printClass(getContext(), getContext().getRootIncommingString(hm)), + Utils.printClass(getContext(), getContext().getRootIncomingString(hm)), Utils.printInstance(hm), size, slots diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/DuplicatedString.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/DuplicatedString.java index 7bbd9f8468..e53a4c3dd2 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/DuplicatedString.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/DuplicatedString.java @@ -86,12 +86,12 @@ protected void perform(Instance in) { Instance arr = fldValue.getRefValue(in); if (arr != null) { - strSize += ((str.length() * 2) + 14); // XXX aproximation + strSize += ((str.length() * 2) + 14); // XXX approximation } - String incomming = getContext().getRootIncommingString(in); - incomming = Utils.printClass(getContext(), incomming); - dupSources.add(incomming, new Histogram.Entry(strSize)); + String incoming = getContext().getRootIncomingString(in); + incoming = Utils.printClass(getContext(), incoming); + dupSources.add(incoming, new Histogram.Entry(strSize)); total += strSize; } diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/HashMapHistogram.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/HashMapHistogram.java index 4bb6612a04..54260885f3 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/HashMapHistogram.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/HashMapHistogram.java @@ -93,7 +93,7 @@ protected void add(HashmapEntry source) { private FieldAccess fldHMEValue; private FieldAccess fldHMTable; private FieldAccess fldSValue; - private Histogram byIncomming; + private Histogram byIncoming; private JavaClass clsHM; private JavaClass clsHME; private JavaClass clsString; @@ -116,9 +116,9 @@ public String getHTMLDescription() { protected void perform(Instance hm) { HashmapEntry he = sizeOfHashmap(hm); - String incomming = getContext().getRootIncommingString(hm); - incomming = Utils.printClass(getContext(), incomming); - byIncomming.add(incomming, he); + String incoming = getContext().getRootIncomingString(hm); + incoming = Utils.printClass(getContext(), incoming); + byIncoming.add(incoming, he); } protected @Override void prepareRule(MemoryLint context) { @@ -131,11 +131,11 @@ protected void perform(Instance hm) { fldHMEKey = new FieldAccess(clsHME, "key"); // NOI18N fldHMEValue = new FieldAccess(clsHME, "value"); // NOI18N fldHMENext = new FieldAccess(clsHME, "next"); // NOI18N - byIncomming = new Histogram(); + byIncoming = new Histogram(); } protected @Override void summary() { - getContext().appendResults(byIncomming.toString(50000)); + getContext().appendResults(byIncoming.toString(50000)); } private boolean add(Instance inst) { diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/OverallocatedString.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/OverallocatedString.java index b19dc17e8e..35e70d18fc 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/OverallocatedString.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/OverallocatedString.java @@ -115,9 +115,9 @@ protected void summary() { Histogram h = new Histogram(); for (Map.Entry e : covered.entrySet()) { - String incomming = getContext().getRootIncommingString(e.getKey()); - incomming = Utils.printClass(getContext(), incomming); - h.add(incomming, new Histogram.Entry(e.getValue())); + String incoming = getContext().getRootIncomingString(e.getKey()); + incoming = Utils.printClass(getContext(), incoming); + h.add(incoming, new Histogram.Entry(e.getValue())); } getContext().appendResults(h.toString(5000)); diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/RetainedSetByClass.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/RetainedSetByClass.java index 9c9fb43208..642671e342 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/RetainedSetByClass.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/RetainedSetByClass.java @@ -90,7 +90,7 @@ public void perform() { Logger.getLogger(RetainedSetByClass.class.getName()).log(Level.FINE, "Executing rule on class {0}.", cls); // NOI18N performClass(cls, hist); - if (context.isInterruped()) { + if (context.isInterrupted()) { return; } diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/TooManyBooleans.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/TooManyBooleans.java index 6cbccd23f8..a90a86a366 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/TooManyBooleans.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/TooManyBooleans.java @@ -83,7 +83,7 @@ protected void perform(Instance in) { } count++; - booleans.add(Utils.printClass(getContext(), getContext().getRootIncommingString(in)), new Histogram.Entry(in.getSize())); + booleans.add(Utils.printClass(getContext(), getContext().getRootIncomingString(in)), new Histogram.Entry(in.getSize())); } protected @Override void prepareRule(MemoryLint context) { diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/WrongWeakHashMap.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/WrongWeakHashMap.java index fae890b753..3191efe47a 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/WrongWeakHashMap.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/memorylint/rules/WrongWeakHashMap.java @@ -79,7 +79,7 @@ private class WHMRecord { public String toString() { return NbBundle.getMessage(WrongWeakHashMap.class, "FMT_WWHM_Entry", new Object[] { - Utils.printClass(getContext(), getContext().getRootIncommingString(hm)), + Utils.printClass(getContext(), getContext().getRootIncomingString(hm)), Utils.printInstance(hm), Utils.printInstance(key), Utils.printInstance(value) diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/model/AbstractHeapWalkerNode.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/model/AbstractHeapWalkerNode.java index 753b34ef95..7052d8bc0b 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/model/AbstractHeapWalkerNode.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/model/AbstractHeapWalkerNode.java @@ -97,10 +97,10 @@ public HeapWalkerNode[] getChildren() { private Map getIndexes() { if (indexes == null) { - HeapWalkerNode[] chldrn = getChildren(); - indexes = new HashMap(chldrn.length * 4 / 3); - for (int i = 0; i < chldrn.length; i++) - indexes.put(chldrn[i], i); + HeapWalkerNode[] children = getChildren(); + indexes = new HashMap(children.length * 4 / 3); + for (int i = 0; i < children.length; i++) + indexes.put(children[i], i); } return indexes; @@ -204,7 +204,7 @@ public String getRetainedSize() { } // used for testing children for null without lazy-populating invocation - // note that if false, it means that chilren are not yet computed OR this node is leaf! + // note that if false, it means that children are not yet computed OR this node is leaf! public boolean currentlyHasChildren() { return children != null; } diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/model/HeapWalkerNode.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/model/HeapWalkerNode.java index a9ecf97b61..30dd6ec049 100644 --- a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/model/HeapWalkerNode.java +++ b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/model/HeapWalkerNode.java @@ -99,7 +99,7 @@ public abstract class HeapWalkerNode extends CCTNode { public abstract Object getNodeID(); // used for testing children for null without lazy-populating invocation - // note that if false, it means that chilren are not yet computed OR this node is leaf! + // note that if false, it means that children are not yet computed OR this node is leaf! public abstract boolean currentlyHasChildren(); /** diff --git a/visualvm/libs.profiler/profiler.oql/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/impl/hat.js b/visualvm/libs.profiler/profiler.oql/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/impl/hat.js index 1819d3afd2..12b10a054a 100644 --- a/visualvm/libs.profiler/profiler.oql/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/impl/hat.js +++ b/visualvm/libs.profiler/profiler.oql/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/impl/hat.js @@ -630,7 +630,7 @@ function unwrapMap(jobject) { function unwrapArray(jsobject) { var array = new Object[jsobject.length]; - for(var i=0;i iter = intervals.iterator(); while (iter.hasNext()) { int start = iter.next(); - int wdth = iter.next() - start + 1; - g.fillRect(start, height - 6, Math.min(wdth, width - start - 3), 3); + int width = iter.next() - start + 1; + g.fillRect(start, height - 6, Math.min(width, width - start - 3), 3); } } diff --git a/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/timeline/TimelineLegendOverlay.java b/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/timeline/TimelineLegendOverlay.java index 3de52f9bdb..3f709e2cbf 100644 --- a/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/timeline/TimelineLegendOverlay.java +++ b/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/timeline/TimelineLegendOverlay.java @@ -119,7 +119,7 @@ private void paint(Graphics g, int x, int y) { painter.paint(g); } - // --- Peformance tweaks --------------------------------------------------- + // --- Performance tweaks --------------------------------------------------- public void invalidate() {} diff --git a/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/timeline/TimelineUnitsOverlay.java b/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/timeline/TimelineUnitsOverlay.java index 18fc31ab3c..9654b17ad1 100644 --- a/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/timeline/TimelineUnitsOverlay.java +++ b/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/impl/timeline/TimelineUnitsOverlay.java @@ -145,7 +145,7 @@ private void paint(Graphics g, int x, int y) { } - // --- Peformance tweaks --------------------------------------------------- + // --- Performance tweaks --------------------------------------------------- public void invalidate() {} diff --git a/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/logs/LogRecords.java b/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/logs/LogRecords.java index b77704b1fb..b9e7bb91a5 100644 --- a/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/logs/LogRecords.java +++ b/visualvm/libs.profiler/profiler.snaptracer/src/org/graalvm/visualvm/lib/profiler/snaptracer/logs/LogRecords.java @@ -204,9 +204,9 @@ public void startPrefixMapping(String prefix, String uri) throws SAXException { public void endPrefixMapping(String prefix) throws SAXException { } - public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException { + public void startElement(String uri, String localName, String qName, Attributes attrs) throws SAXException { if (LOG.isLoggable(Level.FINEST)) { - LOG.log(Level.FINEST, "uri: {0} localName: {1} qName: {2} atts: {3}", new Object[] { uri, localName, qName, atts }); + LOG.log(Level.FINEST, "uri: {0} localName: {1} qName: {2} attrs: {3}", new Object[] { uri, localName, qName, attrs }); } try { @@ -215,7 +215,7 @@ public void startElement(String uri, String localName, String qName, Attributes currentEx = new FakeException(new EnumMap(values)); } } catch (IllegalArgumentException ex) { - LOG.log(Level.FINE, "Uknown tag " + qName, ex); + LOG.log(Level.FINE, "Unknown tag " + qName, ex); current = null; } chars = new StringBuilder(); diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/NetBeansProfiler.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/NetBeansProfiler.java index 9ec20a5a3d..8e92839102 100644 --- a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/NetBeansProfiler.java +++ b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/NetBeansProfiler.java @@ -878,7 +878,7 @@ public boolean cleanForProfilingOnPort(int port) { // agent file exists, agent is still shutting down or in undefined state (hanging?) if (agentFile.exists()) { - // returns true if agent file successfuly deleted, false otherwise (will cause server startup failure because initial STATE_INACTIVE) + // returns true if agent file successfully deleted, false otherwise (will cause server startup failure because initial STATE_INACTIVE) boolean fileDeleted = waitForDeleteAgentFile(agentFile); if (!fileDeleted) { diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/ResultsManager.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/ResultsManager.java index 7304313961..b84b40ec2d 100644 --- a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/ResultsManager.java +++ b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/ResultsManager.java @@ -112,7 +112,7 @@ "ResultsManager_SnapshotCreateInProjectFailedMsg=Failed to create snapshot file in project: {0}", "ResultsManager_SnapshotLoadFailed=Error while loading snapshot: {0}", "ResultsManager_SnapshotsLoadFailedMsg=Loading snapshots failed.", - "ResultsManager_ObtainSavedSnapshotsFailedMsg=Failed to obtain list of saved snaphshots for project: {0}", + "ResultsManager_ObtainSavedSnapshotsFailedMsg=Failed to obtain list of saved snapshots for project: {0}", "ResultsManager_SelectDirDialogCaption=Select Target Directory", "ResultsManager_SaveButtonName=Save", "ResultsManager_OverwriteFileDialogCaption=Overwrite Existing File?", @@ -124,7 +124,7 @@ "ResultsManager_ProfilerSnapshotFileFilter=Profiler Snapshot File (*.{0})", "ResultsManager_ProfilerHeapdumpFileFilter=Heap Dump File (*.{0})", "ResultsManager_OutOfMemorySavingMsg=Not enough memory to save the snapshot.

To avoid this error please increase the -Xmx value
in the etc/visualvm.conf file in VisualVM directory.", - "ResultsManager_CannotCompareSnapshotsMsg=Cannot compare snapshots:

{0}
{1}

Make sure that both snaphots are the same type.", + "ResultsManager_CannotCompareSnapshotsMsg=Cannot compare snapshots:

{0}
{1}

Make sure that both snapshots are the same type.", "ResultsManager_DirectoryDoesntExistCaption=Selected Directory Does Not Exist", "ResultsManager_DirectoryDoesntExistMsg=The directory you have selected does not exist.\nDo you want to create the directory?", "ResultsManager_SnapshotLoadFailedMsg=Snapshot {0} failed to load.

{1}", @@ -857,7 +857,7 @@ public LoadedSnapshot prepareSnapshot() { return prepareSnapshot(true); } - public LoadedSnapshot prepareSnapshot(boolean reqeustData) { + public LoadedSnapshot prepareSnapshot(boolean requestData) { ResultsSnapshot snapshot = null; if (!resultsAvailable()) { @@ -875,13 +875,13 @@ public LoadedSnapshot prepareSnapshot(boolean reqeustData) { case ProfilingSettings.PROFILE_MEMORY_ALLOCATIONS: case ProfilingSettings.PROFILE_MEMORY_LIVENESS: case ProfilingSettings.PROFILE_MEMORY_SAMPLING: - snapshot = client.getMemoryProfilingResultsSnapshot(reqeustData); + snapshot = client.getMemoryProfilingResultsSnapshot(requestData); break; case ProfilingSettings.PROFILE_CPU_ENTIRE: case ProfilingSettings.PROFILE_CPU_PART: case ProfilingSettings.PROFILE_CPU_SAMPLING: - snapshot = client.getCPUProfilingResultsSnapshot(reqeustData); + snapshot = client.getCPUProfilingResultsSnapshot(requestData); break; case ProfilingSettings.PROFILE_CPU_STOPWATCH: @@ -889,7 +889,7 @@ public LoadedSnapshot prepareSnapshot(boolean reqeustData) { break; case ProfilingSettings.PROFILE_CPU_JDBC: - snapshot = client.getJdbcProfilingResultsSnapshot(reqeustData); + snapshot = client.getJdbcProfilingResultsSnapshot(requestData); break; } diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/SnapshotInfoPanel.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/SnapshotInfoPanel.java index 817f9de1df..085a2925e6 100644 --- a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/SnapshotInfoPanel.java +++ b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/SnapshotInfoPanel.java @@ -109,7 +109,7 @@ "SnapshotInfoPanel_InstrumentNewThreadsString=Instrument New Threads:", "SnapshotInfoPanel_InstrumentGettersSettersString=Instrument Getters and Setters:", "SnapshotInfoPanel_InstrumentEmptyMethodsString=Instrument Empty Methods:", - "SnapshotInfoPanel_OverridenGlobalPropertiesString=Overridden Global Properties:", + "SnapshotInfoPanel_OverriddenGlobalPropertiesString=Overridden Global Properties:", "SnapshotInfoPanel_WorkingDirectoryString=Working Directory:", "SnapshotInfoPanel_ProjectPlatformNameString=", "SnapshotInfoPanel_JavaPlatformString=Java Platform:", @@ -457,7 +457,7 @@ public void updateInfo() { htmlText.append(Bundle.SnapshotInfoPanel_ProfilingMode()).append(" "); // NOI18N htmlText.append(""); // NOI18N boolean classes; - // NOTE: currently not possible to detect Defined Clases + // NOTE: currently not possible to detect Defined Classes if (Wildcards.ALLWILDCARD.equals(roots[0].getMethodName())) { htmlText.append(Bundle.SnapshotInfoPanel_MethodsSelectedClasses()); classes = true; @@ -558,7 +558,7 @@ public void updateInfo() { htmlText.append(""); // NOI18N htmlText.append(Bundle.SnapshotInfoPanel_ProfilingMode()).append(" "); // NOI18N htmlText.append(""); // NOI18N - htmlText.append(Bundle.SnapshotInfoPanel_ObjectsSelectedClasses()); // NOTE: currently not possible to detect Defined Clases + htmlText.append(Bundle.SnapshotInfoPanel_ObjectsSelectedClasses()); // NOTE: currently not possible to detect Defined Classes htmlText.append("
"); // NOI18N htmlText.append(""); // NOI18N htmlText.append(Bundle.SnapshotInfoPanel_ProfilingTypeString()).append(" "); // NOI18N @@ -591,7 +591,7 @@ public void updateInfo() { htmlText.append(""); // NOI18N htmlText.append(Bundle.SnapshotInfoPanel_ProfilingMode()).append(" "); // NOI18N htmlText.append(""); // NOI18N - htmlText.append(Bundle.SnapshotInfoPanel_ObjectsSelectedClasses()); // NOTE: currently not possible to detect Defined Clases + htmlText.append(Bundle.SnapshotInfoPanel_ObjectsSelectedClasses()); // NOTE: currently not possible to detect Defined Classes htmlText.append("
"); // NOI18N htmlText.append(""); // NOI18N htmlText.append(Bundle.SnapshotInfoPanel_ProfilingTypeString()).append(" "); // NOI18N @@ -619,7 +619,7 @@ public void updateInfo() { break; } - appendOverridenGlobalProperties(htmlText, ps); + appendOverriddenGlobalProperties(htmlText, ps); htmlText.append(""); // NOI18N htmlText.append("
"); // NOI18N @@ -947,12 +947,12 @@ private void appendMemoryText(StringBuffer htmlText, ProfilingSettings ps) { htmlText.append("
"); // NOI18N } - private void appendOverridenGlobalProperties(StringBuffer htmlText, ProfilingSettings ps) { + private void appendOverriddenGlobalProperties(StringBuffer htmlText, ProfilingSettings ps) { // Done if (ps.getOverrideGlobalSettings()) { htmlText.append("
"); // NOI18N htmlText.append(""); // NOI18N - htmlText.append(Bundle.SnapshotInfoPanel_OverridenGlobalPropertiesString()).append(" "); // NOI18N + htmlText.append(Bundle.SnapshotInfoPanel_OverriddenGlobalPropertiesString()).append(" "); // NOI18N htmlText.append(""); // NOI18N htmlText.append("
"); // NOI18N htmlText.append("
"); // NOI18N diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/HeapDumpAction.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/HeapDumpAction.java index de6764c89a..f306314415 100644 --- a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/HeapDumpAction.java +++ b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/HeapDumpAction.java @@ -95,7 +95,7 @@ "HeapDumpAction_WrongDestinationMsg=Dumping heap failed, cannot resolve destination file.", "HeapDumpAction_DumpingHeapText=Dumping heap...", "HeapDumpAction_SavedDialogCaption=Heap Dump Saved", - "HeapDumpAction_SavedDialogText=The heap has been successfuly saved to a file.
Do you want to open it in HeapWalker?", + "HeapDumpAction_SavedDialogText=The heap has been successfully saved to a file.
Do you want to open it in HeapWalker?", "HeapDumpAction_DumpingFailedMsg=Taking heap dump failed. See NetBeans logfile for details.", "HeapDumpAction_DestinationDialogCaption=Choose Heap Dump Destination", "HeapDumpAction_LocationProjectString=Profiled project", diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/JavaPlatformSelector.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/JavaPlatformSelector.java index 34dabeb8b7..63e32eb97a 100644 --- a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/JavaPlatformSelector.java +++ b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/JavaPlatformSelector.java @@ -64,7 +64,7 @@ */ @NbBundle.Messages({ "JavaPlatformSelector_OkButtonName=OK", - "JavaPlatformSelector_UseSelPlatformChckBoxName=Always use the selected platform for profiling", + "JavaPlatformSelector_UseSelPlatformCheckBoxName=Always use the selected platform for profiling", "JavaPlatformSelector_NoSupportedPlatformMsg=None of the installed Java Platforms can be used for profiling.\nNetBeans Profiler requires JDK 5.0 Update 4 and newer.\n\nPlease install a suitable Java Platform and run calibration again.", "JavaPlatformSelector_SelectPlatformCalibrateMsg=Select Java Platform to calibrate:", "JavaPlatformSelector_SelectPlatformCalibrateDialogCaption=Select Java Platform to calibrate", @@ -123,7 +123,7 @@ private JavaPlatformSelector() { noteLabel = new JLabel(); noteLabel.setLabelFor(list); noteLabel.setFocusable(false); - alwaysCheckBox = new JCheckBox(Bundle.JavaPlatformSelector_UseSelPlatformChckBoxName(), false); + alwaysCheckBox = new JCheckBox(Bundle.JavaPlatformSelector_UseSelPlatformCheckBoxName(), false); add(new JScrollPane(list) { public Dimension getPreferredSize() { Dimension d = super.getPreferredSize(); diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/RunCalibrationAction.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/RunCalibrationAction.java index dcf7bd0ac1..d0f2128b1e 100644 --- a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/RunCalibrationAction.java +++ b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/actions/RunCalibrationAction.java @@ -83,7 +83,7 @@ /** - * Provisionary action to explicitely run Profiler calibration. + * Provisionary action to explicitly run Profiler calibration. * * @author Ian Formanek * @author Jiri Sedlacek diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/utils/MainClassChooser.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/utils/MainClassChooser.java index eefbfd010a..dc67703fa9 100644 --- a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/utils/MainClassChooser.java +++ b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/utils/MainClassChooser.java @@ -71,8 +71,8 @@ * @author Jiri Rechtacek */ @NbBundle.Messages({ - "CTL_SelectAvaialableMainClasses=&Select the main class for profiling:", - "CTL_AvaialableMainClasses=&Main classes:", + "CTL_SelectAvailableMainClasses=&Select the main class for profiling:", + "CTL_AvailableMainClasses=&Main classes:", "AD_jMainClassList=N/A", "AD_MainClassChooser=N/A", "LBL_ChooseMainClass_NO_CLASSES_NODE=", @@ -225,7 +225,7 @@ private void initComponents() { getAccessibleContext() .setAccessibleDescription(Bundle.AD_MainClassChooser()); jLabel1.setLabelFor(jMainClassList); - Mnemonics.setLocalizedText(jLabel1, Bundle.CTL_AvaialableMainClasses()); + Mnemonics.setLocalizedText(jLabel1, Bundle.CTL_AvailableMainClasses()); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/utils/MainClassWarning.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/utils/MainClassWarning.java index 00f6f35633..2bfc567067 100644 --- a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/utils/MainClassWarning.java +++ b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/utils/MainClassWarning.java @@ -102,7 +102,7 @@ private void initComponents() { jLabel1 = new javax.swing.JLabel(); jScrollPane1 = new javax.swing.JScrollPane(); - jPanel1 = new MainClassChooser(project, Bundle.CTL_SelectAvaialableMainClasses()); + jPanel1 = new MainClassChooser(project, Bundle.CTL_SelectAvailableMainClasses()); setLayout(new java.awt.GridBagLayout()); diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/ProfilerWindow.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/ProfilerWindow.java index a2bbefefe0..28b9491a89 100644 --- a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/ProfilerWindow.java +++ b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/ProfilerWindow.java @@ -221,7 +221,7 @@ public void run() { SwingUtilities.invokeLater(new Runnable() { public void run() { toolbar.remove(loading); - popupulateUI(); + populateUI(); } }); } @@ -244,7 +244,7 @@ private void loadSessionSettings() { } } - private void popupulateUI() { + private void populateUI() { configure = new PopupButton(Bundle.ProfilerWindow_configure()) { protected void displayPopup() { displayPopupImpl(); } }; @@ -651,7 +651,7 @@ protected void fireItemStateChanged(ItemEvent event) { // --- Popup crowding --- int left = 12; - int labl = 5; + int label = 5; int y = 0; GridBagConstraints c; @@ -660,7 +660,7 @@ protected void fireItemStateChanged(ItemEvent event) { projectL.setFont(popup.getFont().deriveFont(Font.BOLD)); c = new GridBagConstraints(); c.gridy = y++; - c.insets = new Insets(5, labl, 5, 5); + c.insets = new Insets(5, label, 5, 5); c.fill = GridBagConstraints.HORIZONTAL; popup.add(projectL, c); @@ -677,7 +677,7 @@ protected void fireItemStateChanged(ItemEvent event) { profileL.setFont(popup.getFont().deriveFont(Font.BOLD)); c = new GridBagConstraints(); c.gridy = y++; - c.insets = new Insets(_attach ? 8 : 5, labl, 5, 5); + c.insets = new Insets(_attach ? 8 : 5, label, 5, 5); c.fill = GridBagConstraints.HORIZONTAL; popup.add(profileL, c); @@ -703,7 +703,7 @@ protected void fireItemStateChanged(ItemEvent event) { settingsL.setFont(popup.getFont().deriveFont(Font.BOLD)); c = new GridBagConstraints(); c.gridy = y++; - c.insets = new Insets(8, labl, 5, 5); + c.insets = new Insets(8, label, 5, 5); c.fill = GridBagConstraints.HORIZONTAL; popup.add(settingsL, c); @@ -726,7 +726,7 @@ protected void fireItemStateChanged(ItemEvent event) { pluginsL.setFont(popup.getFont().deriveFont(Font.BOLD)); c = new GridBagConstraints(); c.gridy = y++; - c.insets = new Insets(8, labl, 5, 5); + c.insets = new Insets(8, label, 5, 5); c.fill = GridBagConstraints.HORIZONTAL; popup.add(pluginsL, c); diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/ClassMethodSelector.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/ClassMethodSelector.java index 53f7094723..5a5f1a4826 100644 --- a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/ClassMethodSelector.java +++ b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/ClassMethodSelector.java @@ -912,7 +912,7 @@ private static Collection getClasses(SourcePackageInfo pkg, boo SourceClassInfo cls = classes.iterator().next(); classes.remove(cls); if (anonymous || !cls.isAnonymous()) _classes.add(cls); - classes.addAll(cls.getInnerClases()); + classes.addAll(cls.getInnerClasses()); } classes = _classes; } @@ -1061,8 +1061,8 @@ public void run() { SwingUtilities.invokeLater(new Runnable() { public void run() { methodsList.setEnabled(true); - for (SourceMethodInfo mthd : methods) - methodsListModel.addElement(mthd); + for (SourceMethodInfo method : methods) + methodsListModel.addElement(method); } }); } diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/WelcomePanel.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/WelcomePanel.java index c69b5c4e48..ef0a9b44fe 100644 --- a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/WelcomePanel.java +++ b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/v2/impl/WelcomePanel.java @@ -66,7 +66,7 @@ */ @NbBundle.Messages({ "WelcomePanel_howtoCaption=Configure and Start Profiling", - "WelcomePanel_clickForSetings=Click the {0} button in toolbar and select the desired profiling mode:", + "WelcomePanel_clickForSettings=Click the {0} button in toolbar and select the desired profiling mode:", "WelcomePanel_startProfiling=Click the {0} button in toolbar once the session is configured to start profiling.", "WelcomePanel_modifyProfiling=Use the {0} dropdown arrow to change profiling settings for the session." }) @@ -99,7 +99,7 @@ public WelcomePanel(String configureButton, String profileButton, Set" + configureButton + ""), Integer.toString(++counter), 1, background) { // NOI18N + Paragraph hint1 = new Paragraph(Bundle.WelcomePanel_clickForSettings("" + configureButton + ""), Integer.toString(++counter), 1, background) { // NOI18N protected void showURL(URL url) { highlightItem(null); } }; c = new GridBagConstraints(); diff --git a/visualvm/profiler/src/org/graalvm/visualvm/profiler/Bundle.properties b/visualvm/profiler/src/org/graalvm/visualvm/profiler/Bundle.properties index 04bb46b307..34aef64531 100644 --- a/visualvm/profiler/src/org/graalvm/visualvm/profiler/Bundle.properties +++ b/visualvm/profiler/src/org/graalvm/visualvm/profiler/Bundle.properties @@ -123,7 +123,7 @@ LBL_Java_file_filter=Java Binary ({0}) BTN_Browse=&Browse BTN_Ok=OK -STR_Externaly_started_app=externally started application +STR_Externally_started_app=externally started application # Java 7 STR_Java_platform_name=Java {0} # 64bit diff --git a/visualvm/profiler/src/org/graalvm/visualvm/profiler/CPUSettingsSupport.java b/visualvm/profiler/src/org/graalvm/visualvm/profiler/CPUSettingsSupport.java index a6b39dea0d..f9b87bf96b 100644 --- a/visualvm/profiler/src/org/graalvm/visualvm/profiler/CPUSettingsSupport.java +++ b/visualvm/profiler/src/org/graalvm/visualvm/profiler/CPUSettingsSupport.java @@ -81,7 +81,7 @@ void updateSettings(ProfilerPreset preset) { public boolean settingsValid() { return panel.settingsValid(); } public void showSettings(DataViewComponent dvc) { - panel.highlighInvalid(); + panel.highlightInvalid(); dvc.selectDetailsView(getDetailsView()); } diff --git a/visualvm/profiler/src/org/graalvm/visualvm/profiler/MemorySettingsSupport.java b/visualvm/profiler/src/org/graalvm/visualvm/profiler/MemorySettingsSupport.java index 811effeea3..e8f2e2a774 100644 --- a/visualvm/profiler/src/org/graalvm/visualvm/profiler/MemorySettingsSupport.java +++ b/visualvm/profiler/src/org/graalvm/visualvm/profiler/MemorySettingsSupport.java @@ -81,7 +81,7 @@ void updateSettings(ProfilerPreset preset) { public boolean settingsValid() { return panel.settingsValid(); } public void showSettings(DataViewComponent dvc) { - panel.highlighInvalid(); + panel.highlightInvalid(); dvc.selectDetailsView(getDetailsView()); } diff --git a/visualvm/profiler/src/org/graalvm/visualvm/profiler/ProfilerSupport.java b/visualvm/profiler/src/org/graalvm/visualvm/profiler/ProfilerSupport.java index 4ece936e96..f58f01d2ec 100644 --- a/visualvm/profiler/src/org/graalvm/visualvm/profiler/ProfilerSupport.java +++ b/visualvm/profiler/src/org/graalvm/visualvm/profiler/ProfilerSupport.java @@ -87,7 +87,7 @@ boolean isInitialized() { } public String getProfiledApplicationName() { - String name = NbBundle.getMessage(ProfilerSupport.class, "STR_Externaly_started_app"); // NOI18N + String name = NbBundle.getMessage(ProfilerSupport.class, "STR_Externally_started_app"); // NOI18N Application a = getProfiledApplication(); if (a == null) { int state = NetBeansProfiler.getDefaultNB().getProfilingState(); diff --git a/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilerCPUPanel.java b/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilerCPUPanel.java index dd4b37e15d..b3506b3a05 100644 --- a/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilerCPUPanel.java +++ b/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilerCPUPanel.java @@ -115,7 +115,7 @@ public ProfilingSettings getSettings() { public boolean settingsValid() { return rootsValid && filtersValid; } - public void highlighInvalid() { + public void highlightInvalid() { if (getRootsValue().isEmpty()) rootsArea.getTextArea().setText(ProfilerPresets.DEFINE_CLASSES); } @@ -128,7 +128,7 @@ public void loadFromPreset(ProfilerPreset preset) { inclFilterRadioButton.setSelected(!preset.getFilterModeP()); exclFilterRadioButton.setSelected(preset.getFilterModeP()); filtersArea.getTextArea().setText(preset.getFilterP()); - highlighInvalid(); + highlightInvalid(); internalChange = false; checkRootValidity(); diff --git a/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilerMemoryPanel.java b/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilerMemoryPanel.java index 4af3867504..4094dce262 100644 --- a/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilerMemoryPanel.java +++ b/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilerMemoryPanel.java @@ -104,7 +104,7 @@ public ProfilingSettings getSettings() { public boolean settingsValid() { return rootsValid; } - public void highlighInvalid() { + public void highlightInvalid() { if (getFilterValue().isEmpty()) filtersArea.getTextArea().setText(ProfilerPresets.DEFINE_CLASSES); } @@ -116,7 +116,7 @@ public void loadFromPreset(ProfilerPreset preset) { lifecycleCheckbox.setSelected(preset.getMemoryModeP()); outgoingCheckbox.setSelected(preset.getStacksP()); outgoingSpinner.setValue(preset.getAllocP()); - highlighInvalid(); + highlightInvalid(); internalChange = false; checkRootValidity(); diff --git a/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilingOptionsPanel.java b/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilingOptionsPanel.java index a1bedf5ec1..4aefae3858 100644 --- a/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilingOptionsPanel.java +++ b/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/ProfilingOptionsPanel.java @@ -474,7 +474,7 @@ public void setEnabled(boolean enabled) { add(presetsPanel, c); - // --- Misellaneous ---------------------------------------------------- + // --- Miscellaneous ---------------------------------------------------- int gridy = 50; for (ProfilingOptionsSectionProvider provider : Lookup.getDefault().lookupAll( ProfilingOptionsSectionProvider.class)) { diff --git a/visualvm/startup/src/org/graalvm/visualvm/modules/startup/VisualVMStartup.java b/visualvm/startup/src/org/graalvm/visualvm/modules/startup/VisualVMStartup.java index 110841a193..966496a3f3 100644 --- a/visualvm/startup/src/org/graalvm/visualvm/modules/startup/VisualVMStartup.java +++ b/visualvm/startup/src/org/graalvm/visualvm/modules/startup/VisualVMStartup.java @@ -119,9 +119,9 @@ private static String getJavaInfo() { private static String getJvmInfo() { Properties systemProperties = System.getProperties(); String vmName = systemProperties.getProperty("java.vm.name", "unknown name"); // NOI18N - String vmVerison = systemProperties.getProperty("java.vm.version", ""); // NOI18N + String vmVersion = systemProperties.getProperty("java.vm.version", ""); // NOI18N String vmInfo = systemProperties.getProperty("java.vm.info", ""); // NOI18N - return vmName + " (" + vmVerison + ", " + vmInfo + ")"; // NOI18N + return vmName + " (" + vmVersion + ", " + vmInfo + ")"; // NOI18N } }