From a5360eb0b0ca6367bf1e376eb4e39ba03f02bcc2 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Fri, 10 Mar 2006 13:08:13 +0000 Subject: [PATCH] warnings repaired --- .../gui/main/contactlist/ContactList.java | 15 ++++++-------- .../tabbedPane/CloseTabPaneUI.java | 3 +-- .../tabbedPane/SIPCommTabbedPane.java | 3 ++- .../impl/gui/main/utils/MyImageView.java | 20 +++++++++---------- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java index ff631f612..1410a2c74 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java @@ -61,12 +61,11 @@ public ContactList(MetaContactListService contactList){ } /** - * Adds a child directly to the root node. + * Adds a group directly to the root node. * - * @param child The child object to be added. - * @return The added node. + * @param group The MetaContactGroup to be added. */ - public void addChild(MetaContactGroup group) { + public void addGroup(MetaContactGroup group) { this.listModel.addElement(group); } @@ -75,10 +74,8 @@ public void addChild(MetaContactGroup group) { /** * Adds a child to a given parent. * - * @param parent The parent node. - * @param child The child object. - * @param shouldBeVisible - * @return The added node. + * @param parentGroup The parent group. + * @param contact The child contact node. */ public void addChild(MetaContactGroup parentGroup, @@ -125,7 +122,7 @@ public void metaContactGroupAdded(MetaContactGroupEvent evt) { MetaContactGroup contactGroup = evt.getSourceMetaContactGroup(); - this.addChild(contactGroup); + this.addGroup(contactGroup); Iterator childContacts = contactGroup.getChildContacts(); while (childContacts.hasNext()){ diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneUI.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneUI.java index 9e54d431c..40ef5cd07 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneUI.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneUI.java @@ -352,8 +352,7 @@ public static ComponentUI createUI(JComponent c) { * manage the JTabbedPane. * * @return a layout manager object - * - * @see TabbedPaneLayout + * * @see javax.swing.JTabbedPane#getTabLayoutPolicy */ protected LayoutManager createLayoutManager() { diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java index ff8d36c55..f483f3d63 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java @@ -195,7 +195,8 @@ public void windowLostFocus(WindowEvent e) { frame.addWindowFocusListener(windowFocusListener); - frame.show(); + //frame.show(); + frame.setVisible(true); frame.toFront(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/utils/MyImageView.java b/src/net/java/sip/communicator/impl/gui/main/utils/MyImageView.java index 1d0a938e9..3564125e1 100644 --- a/src/net/java/sip/communicator/impl/gui/main/utils/MyImageView.java +++ b/src/net/java/sip/communicator/impl/gui/main/utils/MyImageView.java @@ -574,7 +574,7 @@ else if( (flags & SOMEBITS) != 0 ) * axis. * * @param axis may be either X_AXIS or Y_AXIS - * @returns the span the view would like to be rendered into. + * @return the span the view would like to be rendered into. * Typically the view is told to render into the span * that is returned, although there is no guarantee. * The parent may choose to resize or break the view. @@ -582,14 +582,14 @@ else if( (flags & SOMEBITS) != 0 ) public float getPreferredSpan(int axis) { //if(DEBUG)System.out.println("ImageView: getPreferredSpan"); int extra = 2*(getBorder()+getSpace(axis)); - switch (axis) { - case View.X_AXIS: - return fWidth+extra; - case View.Y_AXIS: - return fHeight+extra; - default: - throw new IllegalArgumentException("Invalid axis: " + axis); - } + switch (axis) { + case View.X_AXIS: + return fWidth+extra; + case View.Y_AXIS: + return fHeight+extra; + default: + throw new IllegalArgumentException("Invalid axis: " + axis); + } } /** @@ -599,7 +599,7 @@ public float getPreferredSpan(int axis) { * along the x axis. * * @param axis may be either X_AXIS or Y_AXIS - * @returns the desired alignment. This should be a value + * @return the desired alignment. This should be a value * between 0.0 and 1.0 where 0 indicates alignment at the * origin and 1.0 indicates alignment to the full span * away from the origin. An alignment of 0.5 would be the