Revision 329 2.0/trunk/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.extension/src/main/java/org/gvsig/gvsig3d/app/gui/styling/SymbolSelector3D.java

View differences:

SymbolSelector3D.java
23 23
import org.gvsig.app.project.documents.view.legend.gui.ISymbolSelector;
24 24
import org.gvsig.fmap.geom.type.GeometryType;
25 25
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
26
import org.gvsig.gvsig3d.impl.symbology3d.marker.impl.SimpleMarker3DSymbol;
27
import org.gvsig.gvsig3d.symbology3d.marker.ISimpleMarker3DSymbol;
26 28
import org.gvsig.i18n.Messages;
27 29

  
28 30
public class SymbolSelector3D extends JPanel implements ISymbolSelector,
......
38 40
	private PictureSymbolTab _psTab;
39 41
	private Object3DSymbolTab _obTab;
40 42

  
41
	private ISymbol _symbol;
43
	private ISymbol _oldsymbol;
42 44
	private JPanel panel;
43 45
	private JButton btnNewButton;
44 46
	private JButton btnNewButton_1;
45 47
	private ISymbol _newSymbol;
46
	
48

  
47 49
	private ISymbolSelectorTab _activeTab;
48 50

  
49 51
	public SymbolSelector3D() {
......
62 64

  
63 65
	public SymbolSelector3D(ISymbol symbol) {
64 66
		super();
65
		_symbol = symbol;
67
		_oldsymbol = symbol;
66 68
		System.out.println("I'M a CHAMPION");
67 69
	}
68 70

  
69 71
	public SymbolSelector3D(ISymbol symbol, GeometryType shapeType) {
70 72
		super();
71
		_symbol = symbol;
73
		_oldsymbol = symbol;
72 74
		initComponents();
73 75
		SimpleSymbolTab ssTab = new SimpleSymbolTab(this);
74 76
		_tabsPane.add(ssTab);
......
79 81

  
80 82
	public SymbolSelector3D(String domain, ISymbol symbol, Integer shapeType) {
81 83
		super();
82
		_symbol = symbol;
84
		_oldsymbol = symbol;
83 85
		_ssTab = new SimpleSymbolTab(this);
84 86
		_psTab = new PictureSymbolTab(this);
85 87
		_obTab = new Object3DSymbolTab(this);
......
181 183
		btnNewButton_1 = new JButton("Accept");
182 184
		btnNewButton_1.addActionListener(new ActionListener() {
183 185
			public void actionPerformed(ActionEvent arg0) {
184
				_symbol = _activeTab.getNewSymbol();
185
				setSymbol(_symbol);
186
				PluginServices.getMDIManager().closeWindow(SymbolSelector3D.this);
186
				_newSymbol = _activeTab.getNewSymbol();
187

  
188
				if (_newSymbol instanceof ISimpleMarker3DSymbol)
189
					((ISimpleMarker3DSymbol) (_newSymbol))
190
							.setGeometry(((ISimpleMarker3DSymbol) (_oldsymbol))
191
									.getGeometry());
192
				//setSymbol(_newSymbol);
193
				PluginServices.getMDIManager().closeWindow(
194
						SymbolSelector3D.this);
187 195
			}
188 196
		});
189 197
		btnNewButton_1.setHorizontalAlignment(SwingConstants.RIGHT);
......
193 201

  
194 202
	public ISymbol getSymbol() {
195 203

  
196
		return _symbol;
204
		return _oldsymbol;
197 205

  
198 206
	}
199 207

  

Also available in: Unified diff