diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
index 84386433350..f1046c845fc 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,10 @@ public class ColorChooserComponentFactory {
 
     private ColorChooserComponentFactory() { } // can't instantiate
 
+    /**
+     * Returns the default chooser panels.
+     * @return the default chooser panels
+     */
     public static AbstractColorChooserPanel[] getDefaultChooserPanels() {
         return new AbstractColorChooserPanel[] {
                 new DefaultSwatchChooserPanel(),
@@ -58,6 +62,10 @@ public class ColorChooserComponentFactory {
         };
     }
 
+    /**
+     * Returns the preview panel.
+     * @return the preview panel
+     */
     public static JComponent getPreviewPanel() {
         return new DefaultPreviewPanel();
     }
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java
index f8de2344f8e..2ac005c0112 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,9 @@ public class DefaultColorSelectionModel implements ColorSelectionModel, Serializ
      */
     protected transient ChangeEvent changeEvent = null;
 
+    /**
+     * The listener list.
+     */
     protected EventListenerList listenerList = new EventListenerList();
 
     private Color selectedColor;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java b/jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
index 7df25f8430d..4e0df90b8c6 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,7 +101,7 @@ import sun.reflect.misc.ReflectUtil;
 public class EventListenerList implements Serializable {
     /* A null array to be shared by all empty listener lists*/
     private final static Object[] NULL_ARRAY = new Object[0];
-    /* The list of ListenerType - Listener pairs */
+    /** The list of ListenerType - Listener pairs */
     protected transient Object[] listenerList = NULL_ARRAY;
 
     /**
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java
index bf6555c4aac..508d7db8fe8 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,9 +85,21 @@ public class TableModelEvent extends java.util.EventObject
 //  Instance Variables
 //
 
+    /**
+     * The type of the event.
+     */
     protected int       type;
+    /**
+     * The first row that has changed.
+     */
     protected int       firstRow;
+    /**
+     * The last row that has changed.
+     */
     protected int       lastRow;
+    /**
+     * The column for the event.
+     */
     protected int       column;
 
 //
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java b/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java
index 96a7ed3d607..54cd7c037d4 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,6 +73,10 @@ public abstract class FileSystemView {
     private boolean useSystemExtensionHiding =
             UIManager.getDefaults().getBoolean("FileChooser.useSystemExtensionHiding");
 
+    /**
+     * Returns the file system view.
+     * @return the file system view
+     */
     public static FileSystemView getFileSystemView() {
         if(File.separatorChar == '\\') {
             if(windowsFileSystemView == null) {
@@ -101,6 +105,9 @@ public abstract class FileSystemView {
         return genericFileSystemView;
     }
 
+    /**
+     * Constructs a FileSystemView.
+     */
     public FileSystemView() {
         final WeakReference<FileSystemView> weakReference = new WeakReference<FileSystemView>(this);
 
@@ -424,6 +431,10 @@ public abstract class FileSystemView {
     // code. If a given OS can't, override these methods in its
     // implementation.
 
+    /**
+     * Returns the home directory.
+     * @return the home directory
+     */
     public File getHomeDirectory() {
         return createFileObject(System.getProperty("user.home"));
     }