Revision 2470

View differences:

trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/thememanager/legendmanager/panels/FPanelLegendDefault.java
783 783 
			}
784 784 
			else
785 785 
			{
786 
				if (lineWidth <=1)
787 
					m_FSymbol.setStroke(null);
788 
				else
789 
					m_FSymbol.setStroke(new BasicStroke(lineWidth, BasicStroke.CAP_ROUND,
790 
								BasicStroke.JOIN_BEVEL));
786 
                if (bInternal==false)
787 
                {
788 
                    m_FSymbol.m_LinePattern = "0";
789 
    				if (lineWidth <=1)
790 
    					m_FSymbol.setStroke(null);
791 
    				else
792 
    					m_FSymbol.setStroke(new BasicStroke(lineWidth, BasicStroke.CAP_ROUND,
793 
    								BasicStroke.JOIN_BEVEL));
794 
                }
791 795 
			}
792 796 
			// System.out.println(fillPatternComboBox.getSelectedItem().toString() + " " + linePatternComboBox.getSelectedItem().toString());
793 797 
			// JOptionPane.showMessageDialog(this,"HOla","Colega", JOptionPane.INFORMATION_MESSAGE);
......
817 821 
			getFillPatternComboBox().setVisible(true);
818 822 
			lineCheckBox.setVisible(true);
819 823 
			lineColorChooserPanel.setVisible(true);
820
821 
			lineCheckBox.setSelected(m_FSymbol.isOutlined());
822 
			lineColorChooserPanel.setColor(m_FSymbol.getOutlineColor());
823 
			if (m_FSymbol.getColor() != null)
824 
			{
825 
				fillCheckBox.setSelected(true);
826 
				fillColorChooserPanel.setColor(m_FSymbol.getColor());
827 
				setAlpha(m_FSymbol.getColor().getAlpha());
828 
				fillColorChooserPanel.setAlpha(getAlpha());
829 
				lineColorChooserPanel.setAlpha(getAlpha());
830 
			}
831 
			else
832 
			{
833 
				fillCheckBox.setSelected(false);
834 
			}
835
824
836 825 
			linePatternCheckBox.setSelected(false);
826 
            if (m_FSymbol.getFill() != null)
827 
            {
828 
                fillPatternCheckBox.setSelected(true);
829 
                getFillPatternComboBox().setSelectedItem(new Integer(m_FSymbol.getStyle()));
830 
            }
831 
            lineCheckBox.setSelected(m_FSymbol.isOutlined());
832 
            if (m_FSymbol.getColor() != null)
833 
            {
834 
                fillCheckBox.setSelected(true);
835 
                fillColorChooserPanel.setColor(m_FSymbol.getColor());
836 
                setAlpha(m_FSymbol.getColor().getAlpha());
837 
                fillColorChooserPanel.setAlpha(getAlpha());
838 
                lineColorChooserPanel.setAlpha(getAlpha());
839 
            }
840 
            else
841 
            {
842 
                fillCheckBox.setSelected(false);
843 
            }
844
837 845 
			if (m_FSymbol.getStroke() != null)
838 846 
			{
839 847 
				BasicStroke aux = (BasicStroke) m_FSymbol.getStroke();
......
842 850 
					linePatternCheckBox.setSelected(true);
843 851 
					linePatternComboBox.setSelectedItem(m_FSymbol.m_LinePattern);
844 852 
				}
853 
                int outlineSize = (int) aux.getLineWidth();
854 
                lineWidthSlider.setValue(outlineSize);
855
845 856 
			}
846 
			if (m_FSymbol.getFill() != null)
847 
			{
848 
			    fillPatternCheckBox.setSelected(true);
849 
			    getFillPatternComboBox().setSelectedItem(new Integer(m_FSymbol.getStyle()));
850 
			}
857
858 
            lineColorChooserPanel.setColor(m_FSymbol.getOutlineColor());
859
851 860
852 861 
		}
853 862 
		if (m_FSymbol.getSymbolType() == FConstant.SYMBOL_TYPE_LINE)
......
863 872 
			lineCheckBox.setVisible(false);
864 873 
			fillColorChooserPanel.setColor(m_FSymbol.getColor());
865 874 
			lineColorChooserPanel.setVisible(false);
866 
			if (m_FSymbol.getColor() != null)
867 
			{
868 
				lineColorChooserPanel.setColor(m_FSymbol.getColor());
869 
				setAlpha(m_FSymbol.getColor().getAlpha());
870 
				lineColorChooserPanel.setAlpha(getAlpha());
871 
			}
872 875 
			linePatternCheckBox.setSelected(false);
873 876 
			if (m_FSymbol.getStroke() != null)
874 877 
			{
875 878 
				BasicStroke aux = (BasicStroke) m_FSymbol.getStroke();
876 
				if (aux.getDashArray() != null)
879 
				// if (aux.getDashArray() != null)
880 
                if (m_FSymbol.m_LinePattern.compareTo("0") != 0)
877 881 
				{
878 882 
					linePatternCheckBox.setSelected(true);
879 883 
					linePatternComboBox.setSelectedItem(m_FSymbol.m_LinePattern);
880 884 
				}
885 
                int outlineSize = (int) (aux.getLineWidth());
886 
                lineWidthSlider.setValue(outlineSize);
881 887 
			}
888 
            if (m_FSymbol.getColor() != null)
889 
            {
890 
                lineColorChooserPanel.setColor(m_FSymbol.getColor());
891 
                setAlpha(m_FSymbol.getColor().getAlpha());
892 
                lineColorChooserPanel.setAlpha(getAlpha());
893 
            }
894
882 895 
		}
883 896 
		if (m_FSymbol.getSymbolType() == FConstant.SYMBOL_TYPE_POINT)
884 897 
		{

Also available in: Unified diff