[Arianne-commits] stendhal/src/games/stendhal/client/gui ColorSelector.java, 1.7, 1.8 OutfitDialog.java, 1.103, 1.104 j2DClient.java, 1.433, 1.434

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1751/src/games/stendhal/client/gui

Modified Files:
	ColorSelector.java OutfitDialog.java j2DClient.java 
Log Message:
Removed SBoxLayout.constraint() calls where possible


Index: OutfitDialog.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/OutfitDialog.java,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** OutfitDialog.java	17 May 2013 15:26:01 -0000	1.103
--- OutfitDialog.java	18 Aug 2013 09:13:46 -0000	1.104
***************
*** 251,255 ****
  		// --------- Color selection column ---------
  		JComponent column = SBoxLayout.createContainer(SBoxLayout.VERTICAL);
! 		content.add(column, SBoxLayout.constraint(SLayout.EXPAND_Y));
  		JComponent selector = createColorSelector("Hair", OutfitColor.HAIR, hairLabel);
  		selector.setAlignmentX(CENTER_ALIGNMENT);
--- 251,255 ----
  		// --------- Color selection column ---------
  		JComponent column = SBoxLayout.createContainer(SBoxLayout.VERTICAL);
! 		content.add(column, SLayout.EXPAND_Y);
  		JComponent selector = createColorSelector("Hair", OutfitColor.HAIR, hairLabel);
  		selector.setAlignmentX(CENTER_ALIGNMENT);

Index: ColorSelector.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/ColorSelector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ColorSelector.java	23 Apr 2013 20:50:32 -0000	1.7
--- ColorSelector.java	18 Aug 2013 09:13:46 -0000	1.8
***************
*** 60,64 ****
  		add(hueSaturationSelector);
  		lightnessSelector = new LightnessSelector(model);
! 		add(lightnessSelector, SBoxLayout.constraint(SLayout.EXPAND_X));
  	}
  
--- 60,64 ----
  		add(hueSaturationSelector);
  		lightnessSelector = new LightnessSelector(model);
! 		add(lightnessSelector, SLayout.EXPAND_X);
  	}
  

Index: j2DClient.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2DClient.java,v
retrieving revision 1.433
retrieving revision 1.434
diff -C2 -d -r1.433 -r1.434
*** j2DClient.java	17 May 2013 20:19:57 -0000	1.433
--- j2DClient.java	18 Aug 2013 09:13:46 -0000	1.434
***************
*** 338,342 ****
  		// force expand if there's extra space anyway
  		chatText.getPlayerChatText().setMaximumSize(new Dimension(screenSize.width, Integer.MAX_VALUE));
! 		chatBox.add(chatText.getPlayerChatText(), SBoxLayout.constraint(SLayout.EXPAND_X));
  
  		chatBox.add(chatLogArea, SBoxLayout.constraint(SLayout.EXPAND_X, SLayout.EXPAND_Y));
--- 338,342 ----
  		// force expand if there's extra space anyway
  		chatText.getPlayerChatText().setMaximumSize(new Dimension(screenSize.width, Integer.MAX_VALUE));
! 		chatBox.add(chatText.getPlayerChatText(), SLayout.EXPAND_X);
  
  		chatBox.add(chatLogArea, SBoxLayout.constraint(SLayout.EXPAND_X, SLayout.EXPAND_Y));
***************
*** 432,436 ****
  		
  		windowContent.add(horizSplit, SBoxLayout.constraint(SLayout.EXPAND_Y, SLayout.EXPAND_X));
! 		windowContent.add(containerPanel, SBoxLayout.constraint(SLayout.EXPAND_Y));
  		
  		WtWindowManager.getInstance().registerSettingChangeListener(SCALE_PREFERENCE_PROPERTY,
--- 432,436 ----
  		
  		windowContent.add(horizSplit, SBoxLayout.constraint(SLayout.EXPAND_Y, SLayout.EXPAND_X));
! 		windowContent.add(containerPanel, SLayout.EXPAND_Y);
  		
  		WtWindowManager.getInstance().registerSettingChangeListener(SCALE_PREFERENCE_PROPERTY,
***************
*** 540,545 ****
  
  		final JComponent leftColumn = SBoxLayout.createContainer(SBoxLayout.VERTICAL);
! 		leftColumn.add(minimap.getComponent(), SBoxLayout.constraint(SLayout.EXPAND_X));
! 		leftColumn.add(stats.getComponent(), SBoxLayout.constraint(SLayout.EXPAND_X));
  
  		// Add a background for the tabs. The column itself has none.
--- 540,545 ----
  
  		final JComponent leftColumn = SBoxLayout.createContainer(SBoxLayout.VERTICAL);
! 		leftColumn.add(minimap.getComponent(), SLayout.EXPAND_X);
! 		leftColumn.add(stats.getComponent(), SLayout.EXPAND_X);
  
  		// Add a background for the tabs. The column itself has none.
***************
*** 579,583 ****
  		// The setting bar to the top
  		JComponent settings = new SettingsPanel();
! 		containerPanel.add(settings, SBoxLayout.constraint(SLayout.EXPAND_X));
  
  		// Character window
--- 579,583 ----
  		// The setting bar to the top
  		JComponent settings = new SettingsPanel();
! 		containerPanel.add(settings, SLayout.EXPAND_X);
  
  		// Character window