krysalis-jplugin/src/java/org/krysalis/swingx JCloseableRadioButton.java,1.1,1.2 ImageUtils.java,1.1,1.2 StoreEntitySelector.java,1.1,1.2 JOutlookBar.java,1.1,1.2 WindowUtils.java,1.2,1.3 JSwitcherToolBar.java,1.1,1.2

Update of /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx
In directory sc8-pr-cvs1:/tmp/cvs-serv3380/src/java/org/krysalis/swingx

Modified Files:
	JCloseableRadioButton.java ImageUtils.java 
	StoreEntitySelector.java JOutlookBar.java WindowUtils.java 
	JSwitcherToolBar.java 
Log Message:
Last round of Logging fixes and other small code tweak.
Compiles but will not ye work, as dependencies are also in the 
component descriptor.
Will fix later.

Index: JCloseableRadioButton.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/JCloseableRadioButton.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JCloseableRadioButton.java	29 Sep 2003 15:02:12 -0000	1.1
--- JCloseableRadioButton.java	29 Sep 2003 15:54:14 -0000	1.2
***************
*** 36,41 ****
          innerJButton.setFont(new Font("SansSerif", Font.PLAIN, 12));
          innerJButton.setRequestFocusEnabled(false);
!         innerJButton.setAlignmentX((float) 1);
!         innerJButton.setAlignmentY((float) 0);
  
          this.add(innerJButton);
--- 36,41 ----
          innerJButton.setFont(new Font("SansSerif", Font.PLAIN, 12));
          innerJButton.setRequestFocusEnabled(false);
!         innerJButton.setAlignmentX( 1);
!         innerJButton.setAlignmentY( 0);
  
          this.add(innerJButton);

Index: ImageUtils.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/ImageUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImageUtils.java	29 Sep 2003 15:02:12 -0000	1.1
--- ImageUtils.java	29 Sep 2003 15:54:14 -0000	1.2
***************
*** 119,125 ****
  
          if (direction == VERTICAL) {
!             space = (int) (w / n);
          } else {
!             space = (int) (h / n);
          }
  
--- 119,125 ----
  
          if (direction == VERTICAL) {
!             space =  (w / n);
          } else {
!             space =  (h / n);
          }
  
***************
*** 131,137 ****
          int b2 = end.getBlue();
  
!         int rp = (int) ((r2 - r) / n);
!         int gp = (int) ((g2 - g) / n);
!         int bp = (int) ((b2 - b) / n);
  
          for (int i = 0; i < n; i++) {
--- 131,137 ----
          int b2 = end.getBlue();
  
!         int rp =  ((r2 - r) / n);
!         int gp =  ((g2 - g) / n);
!         int bp =  ((b2 - b) / n);
  
          for (int i = 0; i < n; i++) {

Index: StoreEntitySelector.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/StoreEntitySelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StoreEntitySelector.java	29 Sep 2003 15:02:12 -0000	1.1
--- StoreEntitySelector.java	29 Sep 2003 15:54:14 -0000	1.2
***************
*** 297,301 ****
              java.awt.Component viewer = activator.getDefaultViewer(selectedEntity);
              jPreviewPanel.removeAll();
!             jPreviewPanel.add((java.awt.Component) viewer, BorderLayout.CENTER);
          } else {
              jPreviewPanel.removeAll();
--- 297,301 ----
              java.awt.Component viewer = activator.getDefaultViewer(selectedEntity);
              jPreviewPanel.removeAll();
!             jPreviewPanel.add(viewer, BorderLayout.CENTER);
          } else {
              jPreviewPanel.removeAll();

Index: JOutlookBar.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/JOutlookBar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JOutlookBar.java	29 Sep 2003 15:02:12 -0000	1.1
--- JOutlookBar.java	29 Sep 2003 15:54:14 -0000	1.2
***************
*** 220,224 ****
       */
      private void addTab(String name, ImageIcon icon, Component comp) {
!         JButton button = (JButton)new TabButton(name, icon);
          add(button, comp);
          buttons.addElement(button);
--- 220,224 ----
       */
      private void addTab(String name, ImageIcon icon, Component comp) {
!         JButton button = new TabButton(name, icon);
          add(button, comp);
          buttons.addElement(button);

Index: WindowUtils.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/WindowUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WindowUtils.java	29 Sep 2003 15:04:41 -0000	1.2
--- WindowUtils.java	29 Sep 2003 15:54:14 -0000	1.3
***************
*** 22,26 ****
  import org.apache.avalon.framework.configuration.Configuration;
  import org.krysalis.swingx.resources.ResourceFactory;
- import org.krysalis.swingx.concerns.Logging;
  import org.krysalis.swingx.laf.metal.SimpleMetalTheme;
  
--- 22,25 ----
***************
*** 34,38 ****
   */
  public class WindowUtils {
!     private final static org.apache.log4j.Category c = org.apache.log4j.Category.getInstance(org.krysalis.swingx.WindowUtils.class);
      private static JFrame defaultFrame = new JFrame();
  
--- 33,37 ----
   */
  public class WindowUtils {
! 
      private static JFrame defaultFrame = new JFrame();
  
***************
*** 214,218 ****
              Toolkit.getDefaultToolkit().getSystemEventQueue().push(waitQueue);
          } catch (Exception ex) {
!             Logging.warn(c,"Automatic wait cursor not set.", ex);
          }
      }
--- 213,217 ----
              Toolkit.getDefaultToolkit().getSystemEventQueue().push(waitQueue);
          } catch (Exception ex) {
!             //Logging.warn(c,"Automatic wait cursor not set.", ex);
          }
      }

Index: JSwitcherToolBar.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-jplugin/src/java/org/krysalis/swingx/JSwitcherToolBar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JSwitcherToolBar.java	29 Sep 2003 15:02:12 -0000	1.1
--- JSwitcherToolBar.java	29 Sep 2003 15:54:14 -0000	1.2
***************
*** 80,84 ****
              ((AbstractButton) component).setDisabledSelectedIcon(disabledSelectedJIcon);
              buttonGroup.add((AbstractButton) component);
!             super.add((AbstractButton) component);
  
          }
--- 80,84 ----
              ((AbstractButton) component).setDisabledSelectedIcon(disabledSelectedJIcon);
              buttonGroup.add((AbstractButton) component);
!             super.add(component);
  
          }
***************
*** 103,107 ****
          if (component instanceof AbstractButton) {
              buttonGroup.remove((AbstractButton) component);
!             super.remove((AbstractButton) component);
          }
      }
--- 103,107 ----
          if (component instanceof AbstractButton) {
              buttonGroup.remove((AbstractButton) component);
!             super.remove(component);
          }
      }




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf