提交 b4739c36 编写于 作者: S serb

8034068: Label.toString performance improvement

Reviewed-by: anthony, art
上级 4d508e9e
...@@ -26,10 +26,10 @@ package java.awt; ...@@ -26,10 +26,10 @@ package java.awt;
import java.io.PrintStream; import java.io.PrintStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.Objects;
import java.util.Vector; import java.util.Vector;
import java.util.Locale; import java.util.Locale;
import java.util.EventListener; import java.util.EventListener;
import java.util.Iterator;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
...@@ -50,8 +50,6 @@ import java.io.IOException; ...@@ -50,8 +50,6 @@ import java.io.IOException;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeSupport;
import java.beans.Transient; import java.beans.Transient;
import java.awt.event.InputMethodListener;
import java.awt.event.InputMethodEvent;
import java.awt.im.InputContext; import java.awt.im.InputContext;
import java.awt.im.InputMethodRequests; import java.awt.im.InputMethodRequests;
import java.awt.dnd.DropTarget; import java.awt.dnd.DropTarget;
...@@ -8120,18 +8118,12 @@ public abstract class Component implements ImageObserver, MenuContainer, ...@@ -8120,18 +8118,12 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @since JDK1.0 * @since JDK1.0
*/ */
protected String paramString() { protected String paramString() {
String thisName = getName(); final String thisName = Objects.toString(getName(), "");
String str = (thisName != null? thisName : "") + "," + x + "," + y + "," + width + "x" + height; final String invalid = isValid() ? "" : ",invalid";
if (!isValid()) { final String hidden = visible ? "" : ",hidden";
str += ",invalid"; final String disabled = enabled ? "" : ",disabled";
} return thisName + ',' + x + ',' + y + ',' + width + 'x' + height
if (!visible) { + invalid + hidden + disabled;
str += ",hidden";
}
if (!enabled) {
str += ",disabled";
}
return str;
} }
/** /**
...@@ -8140,7 +8132,7 @@ public abstract class Component implements ImageObserver, MenuContainer, ...@@ -8140,7 +8132,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @since JDK1.0 * @since JDK1.0
*/ */
public String toString() { public String toString() {
return getClass().getName() + "[" + paramString() + "]"; return getClass().getName() + '[' + paramString() + ']';
} }
/** /**
......
/* /*
* Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -272,13 +272,13 @@ public class Label extends Component implements Accessible { ...@@ -272,13 +272,13 @@ public class Label extends Component implements Accessible {
* @return the parameter string of this label * @return the parameter string of this label
*/ */
protected String paramString() { protected String paramString() {
String str = ",align="; String align = "";
switch (alignment) { switch (alignment) {
case LEFT: str += "left"; break; case LEFT: align = "left"; break;
case CENTER: str += "center"; break; case CENTER: align = "center"; break;
case RIGHT: str += "right"; break; case RIGHT: align = "right"; break;
} }
return super.paramString() + str + ",text=" + text; return super.paramString() + ",align=" + align + ",text=" + text;
} }
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册