swingme-svn Mailing List for Swing ME (Page 11)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2660
          http://sourceforge.net/p/swingme/code/2660
Author:   yuranet
Date:     2022-10-09 15:03:01 +0000 (Sun, 09 Oct 2022)
Log Message:
-----------
javadoc fix

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/Label.java

Modified: SwingME/src/net/yura/mobile/gui/components/Label.java
===================================================================

--- SwingME/src/net/yura/mobile/gui/components/Label.java	2022-10-02 12:54:08 UTC (rev 2659)
+++ SwingME/src/net/yura/mobile/gui/components/Label.java	2022-10-09 15:03:01 UTC (rev 2660)
@@ -66,10 +66,6 @@
                 textPosition = Graphics.VCENTER | Graphics.RIGHT;
 	}
 
-        protected boolean getDefaultEnabled() {
-            return false;
-        }
-
         /**
          * @param icon The image to be displayed by the label
          * @see javax.swing.JLabel#JLabel(javax.swing.Icon) JLabel.JLabel
@@ -90,6 +86,14 @@
                 setIcon(icon);
         }
 
+        protected String getDefaultName() {
+            return "Label";
+        }
+
+        protected boolean getDefaultEnabled() {
+            return false;
+        }
+
         /**
          * @see TextComponent#setMargin(int)
          * @see javax.swing.AbstractButton#setMargin(java.awt.Insets) AbstractButton.setMargin
@@ -107,177 +111,6 @@
             return padding;
         }
 
-	protected void workoutMinimumSize() {
-
-		int w = getCombinedWidth();
-		int h = getCombinedHeight();
-
-		if (w==0 && h==0) {
-			width=0;
-			height=0;
-		}
-		else {
-                    width = w + (padding*2);
-                    height = h + (padding*2);
-
-                    int max = getMaxWidth();
-                    if (width > max) {
-                        width = max;
-                    }
-		}
-
-	}
-
-	public void paintComponent(Graphics2D g) {
-
-		int x=padding;
-		int y=padding;
-                int iconWidth = getIconWidth();
-
-                String drawString = this.string;
-                if ("".equals(drawString)) { drawString=null; } // when you draw, null or empty string are the same thing
-                
-		int combinedwidth = getCombinedWidth();
-
-                if (font!=null && drawString!=null && combinedwidth > width-(padding*2)) {
-                    combinedwidth = width-(padding*2);
-                    int w = ((((textPosition & Graphics.HCENTER) == 0) && iconWidth>0)?(combinedwidth-iconWidth-gap):combinedwidth) - font.getWidth(extension);
-                    int a = TextArea.searchStringCharOffset(drawString, font, w);
-                    drawString = drawString.substring(0, a)+extension;
-                }
-
-		int combinedheight = getCombinedHeight();
-
-		if ((alignment & Graphics.HCENTER) != 0) {
-			x = (width - combinedwidth)/2;
-		}
-		else if ((alignment & Graphics.RIGHT) != 0) {
-			x = (width - combinedwidth) -padding;
-		}
-
-		if ((alignment & Graphics.VCENTER) != 0) {
-			y = (height - combinedheight)/2;
-		}
-		else if ((alignment & Graphics.BOTTOM) != 0) {
-			y = (height - combinedheight) -padding;
-		}
-
-
-		if (iconWidth>0) {
-
-			int ix=x;
-			int iy=y;
-
-			if ((textPosition & Graphics.HCENTER) != 0) {
-
-				ix = x + (combinedwidth - iconWidth)/2;
-
-			}
-			else if ((textPosition & Graphics.LEFT) != 0 && font!=null && drawString!=null) {
-
-				ix = x + font.getWidth(drawString)+gap;
-
-			}
-
-			if ((textPosition & Graphics.VCENTER) != 0 || (textPosition & Graphics.RIGHT) != 0 || (textPosition & Graphics.LEFT) != 0 ) {
-
-				iy = y + (combinedheight - getIconHeight())/2;
-
-			}
-			else if ((textPosition & Graphics.TOP) != 0 && font!=null && drawString!=null) {
-
-				iy = y + font.getHeight()+gap;
-
-			}
-
-			paintIcon( g, ix, iy  );
-		}
-
-		if (font!=null && drawString!=null) {
-
-			int tx = x;
-			int ty = y;
-
-			if ((textPosition & Graphics.HCENTER) != 0) {
-
-				tx = x + (combinedwidth - font.getWidth(drawString))/2;
-
-			}
-			else if ((textPosition & Graphics.RIGHT) != 0 && iconWidth>0) {
-
-				tx = x + iconWidth+gap;
-
-			}
-
-			if ((textPosition & Graphics.VCENTER) != 0) {
-
-				ty = y + (combinedheight - font.getHeight())/2;
-
-			}
-			else if ((textPosition & Graphics.BOTTOM) != 0 && iconWidth>0) {
-
-				ty = y + getIconHeight()+gap;
-
-			}
-
-
-			g.setColor( getForeground() );
-                        g.setFont(font);
-			g.drawString( drawString, tx,ty );
-		}
-
-	}
-
-        protected void paintIcon(Graphics2D g, int x, int y) {
-            getIcon().paintIcon(this, g, x, y);
-        }
-
-	protected int getCombinedWidth() {
-            return getCombinedWidth(string,getIconWidth());
-	}
-
-        protected int getCombinedWidth(String string,int iconWidth) {
-            	int fw = (font!=null&&string!=null)?font.getWidth(string):0;
-		if ((textPosition & Graphics.HCENTER) != 0) {
-			if (iconWidth<=0 && font == null) return 0;
-			if (iconWidth>0) {
-				return (iconWidth > fw)?iconWidth:fw;
-			}
-			return fw;
-		}
-		else {
-			if (iconWidth>0) { fw=    ((fw==0)?0:gap)     +fw+iconWidth; }
-			return fw;
-		}
-        }
-
-        protected int getCombinedHeight() {
-            return getCombinedHeight(getIconHeight());
-        }
-
-	protected int getCombinedHeight(int iconHeight) {
-
-            // how to work out height based on Text Position
-            //  M=Max S=Sum
-
-            //    M--S--M
-            //    M--M--M
-            //    M--S--M
-
-		int fw = (font!=null && !"".equals(string) && string != null)?font.getHeight():0;
-		if ((textPosition & Graphics.VCENTER)!= 0 || ((textPosition & Graphics.RIGHT)!= 0) || ((textPosition & Graphics.LEFT)!= 0) ) {
-			if (iconHeight<=0 && font == null) return 0;
-			if (iconHeight>0) {
-				return (iconHeight > fw)?iconHeight:fw;
-			}
-			return fw;
-		}
-                else { // only add if HCENTER AND (TOP OR BOTTOM)
-			if (iconHeight>0) { fw=    ((fw==0)?0:gap)     +fw+iconHeight; }
-			return fw;
-		}
-	}
-
         /**
          * @param a The text of the label
          * @see javax.swing.JLabel#setText(java.lang.String) JLabel.setText
@@ -291,6 +124,38 @@
             }
 	}
 
+        public void setValue(Object obj) {
+
+            String drawString=null;
+            Icon image=null;
+            String tip=null;
+
+            if (obj instanceof Option) {
+                Option option = ((Option)obj);
+                drawString = option.getValue();
+                image = option.getIcon();
+                tip = option.getToolTip();
+            }
+            else if (obj!=null) {
+                drawString = String.valueOf(obj);
+            }
+
+//            if (drawString!=null) {
+//                int a = getCombinedWidth(drawString, image!=null?image.getWidth():0);
+//                int w = getMaxTextWidth();
+//
+//                if (a > w) {
+//                    int maxCharacters = Math.min((w/getFont().getWidth('0')),drawString.length());
+//                    drawString = drawString.substring(0, maxCharacters) + extension;
+//                }
+//            }
+
+            // calling setText causes thing like spinner that throw in the setText to stop working
+            string = drawString; // dont want to recalc everything twice
+            setIcon(image);
+            setToolTipText(tip);
+        }
+        
         /**
          * @return The text of the label
          * @see javax.swing.JLabel#getText() JLabel.getText
@@ -408,61 +273,84 @@
             return ((alignment&Graphics.TOP)!=0?Graphics.TOP:((alignment&Graphics.BOTTOM)!=0?Graphics.BOTTOM:Graphics.VCENTER));
         }
 
-        public void setValue(Object obj) {
+	protected void workoutMinimumSize() {
 
-            String drawString=null;
-            Icon image=null;
-            String tip=null;
+		int w = getCombinedWidth();
+		int h = getCombinedHeight();
 
-            if (obj instanceof Option) {
-                Option option = ((Option)obj);
-                drawString = option.getValue();
-                image = option.getIcon();
-                tip = option.getToolTip();
-            }
-            else if (obj!=null) {
-                drawString = String.valueOf(obj);
-            }
+		if (w==0 && h==0) {
+			width=0;
+			height=0;
+		}
+		else {
+                    width = w + (padding*2);
+                    height = h + (padding*2);
 
-//            if (drawString!=null) {
-//                int a = getCombinedWidth(drawString, image!=null?image.getWidth():0);
-//                int w = getMaxTextWidth();
-//
-//                if (a > w) {
-//                    int maxCharacters = Math.min((w/getFont().getWidth('0')),drawString.length());
-//                    drawString = drawString.substring(0, maxCharacters) + extension;
-//                }
-//            }
+                    int max = getMaxWidth();
+                    if (width > max) {
+                        width = max;
+                    }
+		}
+	}
 
-            // calling setText causes thing like spinner that throw in the setText to stop working
-            string = drawString; // dont want to recalc everything twice
-            setIcon(image);
-            setToolTipText(tip);
-        }
-
+        /**
+         * @see javax.swing.JComponent#getMaximumSize() JComponent.getMaximumSize
+         */
         public int getMaxWidth() {
-
             // if the width has not been set yet
             // we will assume as can take the default amount
-
             Border b = getInsets();
-
             int resonableTextLength = getDesktopPane().getWidth() - ( b.getLeft()+b.getRight() );
             int minimumIconWidth = getIconWidth() + padding *2;
-
             return Math.max(resonableTextLength,minimumIconWidth);
+        }
 
+	protected int getCombinedWidth() {
+            return getCombinedWidth(string,getIconWidth());
+	}
+
+        protected int getCombinedWidth(String string,int iconWidth) {
+            	int fw = (font!=null&&string!=null)?font.getWidth(string):0;
+		if ((textPosition & Graphics.HCENTER) != 0) {
+			if (iconWidth<=0 && font == null) return 0;
+			if (iconWidth>0) {
+				return (iconWidth > fw)?iconWidth:fw;
+			}
+			return fw;
+		}
+		else {
+			if (iconWidth>0) { fw=    ((fw==0)?0:gap)     +fw+iconWidth; }
+			return fw;
+		}
         }
 
-        public void updateUI() {
-            super.updateUI();
-            font = theme.getFont(Style.ALL);
-            Integer iconTextGap = (Integer)theme.getProperty("iconTextGap", Style.ALL);
-            if (iconTextGap!=null) {
-                gap = iconTextGap.intValue();
-            }
+        protected int getCombinedHeight() {
+            return getCombinedHeight(getIconHeight());
         }
 
+	protected int getCombinedHeight(int iconHeight) {
+
+            // how to work out height based on Text Position
+            //  M=Max S=Sum
+
+            //    M--S--M
+            //    M--M--M
+            //    M--S--M
+
+		int fw = (font!=null && !"".equals(string) && string != null)?font.getHeight():0;
+		if ((textPosition & Graphics.VCENTER)!= 0 || ((textPosition & Graphics.RIGHT)!= 0) || ((textPosition & Graphics.LEFT)!= 0) ) {
+			if (iconHeight<=0 && font == null) return 0;
+			if (iconHeight>0) {
+				return (iconHeight > fw)?iconHeight:fw;
+			}
+			return fw;
+		}
+                else { // only add if HCENTER AND (TOP OR BOTTOM)
+			if (iconHeight>0) { fw=    ((fw==0)?0:gap)     +fw+iconHeight; }
+			return fw;
+		}
+	}
+
         private int getIconWidth() {
             Icon icon = getIcon();
             return icon!=null?icon.getIconWidth():0;
@@ -473,14 +361,123 @@
             return icon!=null?icon.getIconHeight():0;
         }
 
-        protected String getDefaultName() {
-            return "Label";
+	public void paintComponent(Graphics2D g) {
+
+		int x=padding;
+		int y=padding;
+                int iconWidth = getIconWidth();
+
+                String drawString = this.string;
+                if ("".equals(drawString)) { drawString=null; } // when you draw, null or empty string are the same thing
+                
+		int combinedwidth = getCombinedWidth();
+
+                if (font!=null && drawString!=null && combinedwidth > width-(padding*2)) {
+                    combinedwidth = width-(padding*2);
+                    int w = ((((textPosition & Graphics.HCENTER) == 0) && iconWidth>0)?(combinedwidth-iconWidth-gap):combinedwidth) - font.getWidth(extension);
+                    int a = TextArea.searchStringCharOffset(drawString, font, w);
+                    drawString = drawString.substring(0, a)+extension;
+                }
+
+		int combinedheight = getCombinedHeight();
+
+		if ((alignment & Graphics.HCENTER) != 0) {
+			x = (width - combinedwidth)/2;
+		}
+		else if ((alignment & Graphics.RIGHT) != 0) {
+			x = (width - combinedwidth) -padding;
+		}
+
+		if ((alignment & Graphics.VCENTER) != 0) {
+			y = (height - combinedheight)/2;
+		}
+		else if ((alignment & Graphics.BOTTOM) != 0) {
+			y = (height - combinedheight) -padding;
+		}
+
+
+		if (iconWidth>0) {
+
+			int ix=x;
+			int iy=y;
+
+			if ((textPosition & Graphics.HCENTER) != 0) {
+
+				ix = x + (combinedwidth - iconWidth)/2;
+
+			}
+			else if ((textPosition & Graphics.LEFT) != 0 && font!=null && drawString!=null) {
+
+				ix = x + font.getWidth(drawString)+gap;
+
+			}
+
+			if ((textPosition & Graphics.VCENTER) != 0 || (textPosition & Graphics.RIGHT) != 0 || (textPosition & Graphics.LEFT) != 0 ) {
+
+				iy = y + (combinedheight - getIconHeight())/2;
+
+			}
+			else if ((textPosition & Graphics.TOP) != 0 && font!=null && drawString!=null) {
+
+				iy = y + font.getHeight()+gap;
+
+			}
+
+			paintIcon( g, ix, iy  );
+		}
+
+		if (font!=null && drawString!=null) {
+
+			int tx = x;
+			int ty = y;
+
+			if ((textPosition & Graphics.HCENTER) != 0) {
+
+				tx = x + (combinedwidth - font.getWidth(drawString))/2;
+
+			}
+			else if ((textPosition & Graphics.RIGHT) != 0 && iconWidth>0) {
+
+				tx = x + iconWidth+gap;
+
+			}
+
+			if ((textPosition & Graphics.VCENTER) != 0) {
+
+				ty = y + (combinedheight - font.getHeight())/2;
+
+			}
+			else if ((textPosition & Graphics.BOTTOM) != 0 && iconWidth>0) {
+
+				ty = y + getIconHeight()+gap;
+
+			}
+
+
+			g.setColor( getForeground() );
+                        g.setFont(font);
+			g.drawString( drawString, tx,ty );
+		}
+
+	}
+
+        protected void paintIcon(Graphics2D g, int x, int y) {
+            getIcon().paintIcon(this, g, x, y);
         }
 
+
+        public void updateUI() {
+            super.updateUI();
+            font = theme.getFont(Style.ALL);
+            Integer iconTextGap = (Integer)theme.getProperty("iconTextGap", Style.ALL);
+            if (iconTextGap!=null) {
+                gap = iconTextGap.intValue();
+            }
+        }
+
         //#mdebug debug
 	public String toString() {
             return super.toString() +"("+string+")";
         }
         //#enddebug
-
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2008	Jan	Feb	Mar	Apr	May	Jun	Jul (54)	Aug (33)	Sep (27)	Oct (10)	Nov	Dec
2009	Jan (7)	Feb (5)	Mar (7)	Apr (1)	May (1)	Jun (1)	Jul (25)	Aug (41)	Sep (89)	Oct (99)	Nov (161)	Dec (85)
2010	Jan (10)	Feb (35)	Mar (44)	Apr (115)	May (98)	Jun (87)	Jul (23)	Aug (27)	Sep (63)	Oct (57)	Nov (97)	Dec (62)
2011	Jan (67)	Feb (83)	Mar (43)	Apr (14)	May (43)	Jun (52)	Jul (55)	Aug (97)	Sep (65)	Oct (36)	Nov (67)	Dec (46)
2012	Jan (29)	Feb (24)	Mar (10)	Apr (2)	May (10)	Jun (34)	Jul (31)	Aug (9)	Sep (10)	Oct (10)	Nov (6)	Dec (7)
2013	Jan (1)	Feb (1)	Mar (5)	Apr (2)	May (17)	Jun (10)	Jul (8)	Aug (17)	Sep	Oct (3)	Nov (4)	Dec (1)
2014	Jan (2)	Feb (8)	Mar (2)	Apr	May	Jun	Jul (5)	Aug (2)	Sep (1)	Oct (1)	Nov (5)	Dec (8)
2015	Jan (1)	Feb	Mar (4)	Apr	May (2)	Jun (1)	Jul (1)	Aug	Sep (1)	Oct	Nov (1)	Dec
2016	Jan	Feb (1)	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov (1)	Dec (2)
2018	Jan	Feb (2)	Mar	Apr (1)	May	Jun	Jul	Aug (3)	Sep	Oct	Nov	Dec (4)
2019	Jan (2)	Feb	Mar (4)	Apr (4)	May (2)	Jun (1)	Jul	Aug	Sep (3)	Oct	Nov	Dec (4)
2020	Jan	Feb	Mar	Apr (3)	May (1)	Jun (6)	Jul	Aug (1)	Sep	Oct	Nov (1)	Dec
2021	Jan	Feb (7)	Mar (29)	Apr (8)	May (7)	Jun (45)	Jul (66)	Aug	Sep	Oct (2)	Nov (37)	Dec (34)
2022	Jan (15)	Feb (1)	Mar	Apr	May	Jun (10)	Jul	Aug	Sep	Oct (5)	Nov (1)	Dec (7)
2023	Jan (23)	Feb (18)	Mar (18)	Apr (6)	May (10)	Jun (7)	Jul (1)	Aug	Sep	Oct	Nov (1)	Dec
2024	Jan (11)	Feb (3)	Mar	Apr (6)	May (3)	Jun	Jul	Aug (2)	Sep (16)	Oct (6)	Nov (7)	Dec (6)
2025	Jan (8)	Feb (3)	Mar (7)	Apr (5)	May (21)	Jun (10)	Jul (16)	Aug (5)	Sep (19)	Oct (2)	Nov	Dec

swingme-svn Mailing List for Swing ME (Page 11)

Java UI Framework for Desktop/iOS/Android

swingme-svn — subversion diffs