Changeset 209

Timestamp:

08/11/08 10:49:38 (16 years ago)

Author:

bjn8

Message:

Tidied width and height restrictions ... now can set after construction

File:

• trunk/src/org/expeditee/items/widgets/InteractiveWidget.java (modified) (4 diffs)

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -376 +376 @@
          * @param source
          *            Must not be null. Neither must it's parent
+         *            
          * @param component
-         *            Must not be null
+         *            Must not be null.
+         *            
+         * @param minWidth
+         *                      The min width restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         * 
+         * @param maxWidth
+         *                      The max width restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         * 
+         * @param minHeight
+         *                      The min height restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         * 
+         * @param maxHeight
+         *                      The max height restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         *            
+         * @throws NullPointerException
+         *                      If source, component if null.
+         *            
+         * @throws IllegalArgumentException
+         *                      If source's parent is null.
+         *                      If maxWidth smaller than minWidth and maxWidth larger or equal to zero
+         *                      or if maxHeight smaller than minHeight && maxHeight is larger or equal to zero
+         *                      
          */
         protected InteractiveWidget(Text source, JComponent component,
@@ -393 +419 @@
                 _textRepresentation = source;
                 
-                _minWidth = minWidth;
-
-                if (maxWidth < _minWidth && maxWidth >= 0)
-                        throw new IllegalArgumentException(
-                                        "maxWidth smaller than the min Width");
-                _maxWidth = maxWidth;
-
-                _minHeight = minHeight;
-                if (maxHeight < _minHeight && maxHeight >= 0)
-                        throw new IllegalArgumentException(
-                                        "maxHeight smaller than the min Height");
-                _maxHeight = maxHeight;
+                setSizeRestrictions(minWidth, maxWidth, minHeight, maxHeight); // throws IllegalArgumentException's
 
                 int x = source.getX();
@@ -449 +464 @@
         
         /**
+         * Sets the restrictions - checks values.
+         * 
+         * @param minWidth
+         *                      The min width restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         * 
+         * @param maxWidth
+         *                      The max width restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         * 
+         * @param minHeight
+         *                      The min height restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         * 
+         * @param maxHeight
+         *                      The max height restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         * 
+         * @throws IllegalArgumentException
+         *                      If maxWidth smaller than minWidth and maxWidth larger or equal to zero
+         *                      or if maxHeight smaller than minHeight && maxHeight is larger or equal to zero
+         * 
+         */
+        private void setSizeRestrictions(int minWidth, int maxWidth, int minHeight, int maxHeight) {
+
+                _minWidth = minWidth;
+
+                if (maxWidth < _minWidth && maxWidth >= 0)
+                        throw new IllegalArgumentException(
+                                        "maxWidth smaller than the min Width");
+                _maxWidth = maxWidth;
+
+                _minHeight = minHeight;
+                if (maxHeight < _minHeight && maxHeight >= 0)
+                        throw new IllegalArgumentException(
+                                        "maxHeight smaller than the min Height");
+                _maxHeight = maxHeight;
+        }
+        
+        /**
          * This can be overrided for creating custom copies. The default implementation
          * creates a new widget based on the current state of the widget (via getArgs).
@@ -551 +606 @@
 
         /**
+         * Sets both the new size as well as the new min/max widdet/height restricitons.
+         * 
+         * @param minWidth
+         *                      The min width restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         * 
+         * @param maxWidth
+         *                      The max width restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         * 
+         * @param minHeight
+         *                      The min height restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         * 
+         * @param maxHeight
+         *                      The max height restriction for the widget. 
+         *                      If negative, then there is no restriction.
+         * 
+         * @param newWidth
+         *                      Clamped to new restrictions.
+         * 
+         * @param newHeight
+         *                      Clamped to new restrictions.
+         * 
+         * @throws IllegalArgumentException
+         *                      If maxWidth smaller than minWidth and maxWidth larger or equal to zero
+         *                      or if maxHeight smaller than minHeight && maxHeight is larger or equal to zero
+         * 
+         * @see #setSize(float, float)
+         * 
+         */
+        protected void setSize(int minWidth, int maxWidth, int minHeight, int maxHeight, 
+                        float newWidth, float newHeight) {
+
+                setSizeRestrictions(minWidth, maxWidth, minHeight, maxHeight); // throws IllegalArgumentException's
+                setSize(newWidth, newHeight);
+        }
+        
+        /**
          * Clamped to current min/max width/height.
          * 
          * @param width
+         *                      Clamped to current restrictions.
          * @param height
+         *                      Clamped to current restrictions.
+         * 
+         * @see #setSize(int, int, int, int, float, float)
          */
         public void setSize(float width, float height) {