Revision 38608 branches/v2_0_0_prep/libraries/org.gvsig.symbology/org.gvsig.symbology.swing/org.gvsig.symbology.swing.api/src/main/java/org/gvsig/app/gui/styling/LineProperties.java

View differences:

LineProperties.java
10 10
import javax.swing.BorderFactory;
11 11
import javax.swing.BoxLayout;
12 12
import javax.swing.ButtonGroup;
13
import javax.swing.ImageIcon;
14 13
import javax.swing.JButton;
15 14
import javax.swing.JLabel;
16 15
import javax.swing.JPanel;
17 16
import javax.swing.JRadioButton;
18 17

  
19
import org.gvsig.andami.PluginServices;
18
import org.gvsig.andami.IconThemeHelper;
20 19
import org.gvsig.gui.beans.DefaultBean;
21 20
import org.gvsig.gui.beans.swing.JBlank;
22 21
import org.gvsig.i18n.Messages;
......
55 54

  
56 55
		pnlJoin.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), Messages.getText("join_style")+":"));
57 56

  
58
		//////////
59
		PluginServices.getIconTheme().registerDefault(
60
				"join-bevel",
61
				this.getClass().getClassLoader().getResource("images/join_bevel.png"));
62
		PluginServices.getIconTheme().registerDefault(
63
				"join-bevel-selected",
64
				this.getClass().getClassLoader().getResource("images/join_bevel-selected.png"));
65
		ImageIcon img= PluginServices.getIconTheme().get("join-bevel");
66

  
67 57
		JPanel d = new JPanel();
68 58
		JPanel toCenter;
69 59
		d.setLayout(new BoxLayout(d, BoxLayout.Y_AXIS));
70
		joinBevel = new JRadioButton(img);
71
		joinBevel.setSelectedIcon(PluginServices.getIconTheme().get("join-bevel-selected"));
60
		joinBevel = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-join-bevel"));
61
		joinBevel.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-join-bevel-selected"));
72 62
		FlowLayout flowCenteredLayout = new FlowLayout(FlowLayout.CENTER, 0, 0);
73 63
		toCenter = new JPanel(flowCenteredLayout);
74 64
		toCenter.add(joinBevel);
......
80 70

  
81 71
		pnlJoin.add(d);
82 72

  
83
		PluginServices.getIconTheme().registerDefault(
84
				"join-miter",
85
				this.getClass().getClassLoader().getResource("images/join_miter.png"));
86
		PluginServices.getIconTheme().registerDefault(
87
				"join-miter-selected",
88
				this.getClass().getClassLoader().getResource("images/join_miter-selected.png"));
89 73

  
90
		img= PluginServices.getIconTheme().get("join-miter");
91

  
92 74
		d = new JPanel();
93 75
		d.setLayout(new BoxLayout(d, BoxLayout.Y_AXIS));
94
		joinMiter = new JRadioButton(img);
95
		joinMiter.setSelectedIcon(PluginServices.getIconTheme().get("join-miter-selected"));
76
		joinMiter = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-join-miter"));
77
		joinMiter.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-join-miter-selected"));
96 78
		toCenter = new JPanel(flowCenteredLayout);
97 79
		toCenter.add(joinMiter);
98 80
		d.add(toCenter);
......
102 84
		d.add(toCenter);
103 85
		pnlJoin.add(d);
104 86

  
105
		PluginServices.getIconTheme().registerDefault(
106
				"join-round",
107
				this.getClass().getClassLoader().getResource("images/join_round.png"));
108
		PluginServices.getIconTheme().registerDefault(
109
				"join-round-selected",
110
				this.getClass().getClassLoader().getResource("images/join_round-selected.png"));
111
		img= PluginServices.getIconTheme().get("join-round");
112 87

  
88

  
113 89
		d = new JPanel();
114 90
		d.setLayout(new BoxLayout(d, BoxLayout.Y_AXIS));
115
		joinRound = new JRadioButton(img);
116
		joinRound.setSelectedIcon(PluginServices.getIconTheme().get("join-round-selected"));
91
		joinRound = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-join-round"));
92
		joinRound.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-join-round-selected"));
117 93
		toCenter = new JPanel(flowCenteredLayout);
118 94
		toCenter.add(joinRound);
119 95
		d.add(toCenter);
......
134 110
		JPanel pnlCap = new JPanel(new FlowLayout(FlowLayout.LEFT, 30, 0));
135 111
		pnlCap.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), Messages.getText("end_style")+":"));
136 112

  
137
		PluginServices.getIconTheme().registerDefault(
138
				"cap-butt",
139
				this.getClass().getClassLoader().getResource("images/cap_butt.png"));
140
		PluginServices.getIconTheme().registerDefault(
141
				"cap-butt-selected",
142
				this.getClass().getClassLoader().getResource("images/cap_butt-selected.png"));
143
		img= PluginServices.getIconTheme().get("cap-butt");
144

  
145 113
		JPanel c = new JPanel();
146 114
		c.setLayout(new BoxLayout(c, BoxLayout.Y_AXIS));
147
		capBut = new JRadioButton(img);
148
		capBut.setSelectedIcon(PluginServices.getIconTheme().get("cap-butt-selected"));
115
		capBut = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-cap-butt"));
116
		capBut.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-cap-butt-selected"));
149 117
		toCenter = new JPanel(flowCenteredLayout);
150 118
		toCenter.add(capBut);
151 119
		c.add(toCenter);
......
154 122
		c.add(toCenter);
155 123
		pnlCap.add(c);
156 124

  
157
		PluginServices.getIconTheme().registerDefault(
158
				"cap-round",
159
				this.getClass().getClassLoader().getResource("images/cap_round.png"));
160
		PluginServices.getIconTheme().registerDefault(
161
				"cap-round-selected",
162
				this.getClass().getClassLoader().getResource("images/cap_round-selected.png"));
163
		img= PluginServices.getIconTheme().get("cap-round");
164

  
165

  
166 125
		JPanel a = new JPanel();
167 126
		a.setLayout(new BoxLayout(a, BoxLayout.Y_AXIS));
168
		capRound = new JRadioButton(img);
169
		capRound.setSelectedIcon(PluginServices.getIconTheme().get("cap-round-selected"));
127
		capRound = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-cap-round"));
128
		capRound.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-cap-round-selected"));
170 129
		toCenter = new JPanel(flowCenteredLayout);
171 130
		toCenter.add(capRound);
172 131
		a.add(toCenter);
......
175 134
		a.add(toCenter);
176 135
		pnlCap.add(a);
177 136

  
178
		PluginServices.getIconTheme().registerDefault(
179
				"cap-square",
180
				this.getClass().getClassLoader().getResource("images/cap_square.png"));
181
		PluginServices.getIconTheme().registerDefault(
182
				"cap-square-selected",
183
				this.getClass().getClassLoader().getResource("images/cap_square-selected.png"));
184
		img= PluginServices.getIconTheme().get("cap-square");
185 137

  
186 138
		JPanel b = new JPanel();
187 139
		b.setLayout(new BoxLayout(b, BoxLayout.Y_AXIS));
188
		capSquare = new JRadioButton(img);
189
		capSquare.setSelectedIcon(PluginServices.getIconTheme().get("cap-square-selected"));
140
		capSquare = new JRadioButton(IconThemeHelper.getImageIcon("line-properties-cap-square"));
141
		capSquare.setSelectedIcon(IconThemeHelper.getImageIcon("line-properties-cap-square-selected"));
190 142
		toCenter = new JPanel(flowCenteredLayout);
191 143
		toCenter.add(capSquare);
192 144

  

Also available in: Unified diff