summaryrefslogtreecommitdiff
path: root/javax/swing/JEditorPane.java
diff options
context:
space:
mode:
Diffstat (limited to 'javax/swing/JEditorPane.java')
-rw-r--r--javax/swing/JEditorPane.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/javax/swing/JEditorPane.java b/javax/swing/JEditorPane.java
index 2b5d9e0a4..63c79ffdf 100644
--- a/javax/swing/JEditorPane.java
+++ b/javax/swing/JEditorPane.java
@@ -15,8 +15,8 @@ General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
@@ -117,8 +117,14 @@ public class JEditorPane extends JTextComponent
return getEditorKit().getContentType();
}
+ /**
+ * Returns the EditorKit. If there is no EditorKit set this method
+ * calls createDefaultEditorKit() and setEditorKit() first.
+ */
public EditorKit getEditorKit()
{
+ if (editorKit == null)
+ setEditorKit(createDefaultEditorKit());
return editorKit;
}