← Back to branch summary

~ubuntu-branches/ubuntu/natty/electric/natty

« back to all changes in this revision

Viewing changes to com/sun/electric/tool/user/dialogs/GetInfoNode.java

  • Committer: Bazaar Package Importer
  • Author(s): Onkar Shinde
  • Date: 2010-01-09 16:26:04 UTC
  • mfrom: (1.1.4 upstream) (3.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100109162604-1ypvmy8ijmlc6oq7
Tags: 8.10-1
* New upstream version.
* debian/control
  - Add libjava3d-java and quilt build dependencies.
  - Update standards version to 3.8.3.
  - Add libjava3d-java as recommends to binary package.
* debian/rules
  - Use quilt patch system instead of simple patchsys.
  - Add java3d related jar files to DEB_JARS.
* debian/patches/*
  - Update as per current upstream source. Convert to quilt.
* debian/ant.properties
  - Do not disable 3D plugin anymore.
  - Use new property to disable compilation of OS X related classes.
* debian/wrappers/electric
  - Add java3d related jar files to runtime classpath.
* debian/README.source
  - Change text to the appropriate one for quilt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
com/sun/electric/tool/user/dialogs/GetInfoNode.java
53
53
import com.sun.electric.tool.Client;
54
54
import com.sun.electric.tool.Job;
55
55
import com.sun.electric.tool.JobException;
56
 
import com.sun.electric.tool.user.Highlight2;
 
56
import com.sun.electric.tool.user.Highlight;
57
57
import com.sun.electric.tool.user.HighlightListener;
58
58
import com.sun.electric.tool.user.Highlighter;
59
59
import com.sun.electric.tool.user.User;
263
263
                PortProto pp = null;
264
264
                int nodeCount = 0;
265
265
                if (wnd != null) {
266
 
                        for(Highlight2 h : wnd.getHighlighter().getHighlights())
 
266
                        for(Highlight h : wnd.getHighlighter().getHighlights())
267
267
                        {
268
268
                                if (!h.isHighlightEOBJ()) continue;
269
269
                                ElectricObject eobj = h.getElectricObject();
394
394
                mirrorY.setSelected(initialMirrorY);
395
395
                rotation.setText(TextUtils.formatDouble(initialRotation / 10.0));
396
396
 
397
 
                // special case for transistors
 
397
                // special case for transistors or resistors
398
398
                PrimitiveNodeSize npSize = ni.getPrimitiveDependentNodeSize(null);
399
399
                if (npSize != null) {
400
400
                        xsizeLabel.setText("Width:");
642
642
                }
643
643
                if (fun.isResistor())
644
644
                {
645
 
                        if (fun == PrimitiveNode.Function.RESPPOLY || fun == PrimitiveNode.Function.RESNPOLY)
 
645
                        if (fun == PrimitiveNode.Function.RESPPOLY || fun == PrimitiveNode.Function.RESNPOLY ||
 
646
                fun == PrimitiveNode.Function.RESPNSPOLY || fun == PrimitiveNode.Function.RESNNSPOLY)
646
647
                                textField1Label.setText("Poly resistance:");
 
648
            else if (fun == PrimitiveNode.Function.RESHIRESPOLY2)
 
649
                textField1Label.setText("Hi-Res Poly2 resistance:");
647
650
            else if (fun == PrimitiveNode.Function.RESPWELL || fun == PrimitiveNode.Function.RESNWELL)
648
651
                textField1Label.setText("Well resistance:");
 
652
            else if (fun == PrimitiveNode.Function.RESPACTIVE || fun == PrimitiveNode.Function.RESNACTIVE)
 
653
                textField1Label.setText("Active resistance:");
649
654
            else
650
655
                textField1Label.setText("Resistance:");
651
656
//                      formatinfstr(infstr, x_(" (%s):"),
659
664
                if (fun.isCapacitor())
660
665
                {
661
666
                        if (fun == PrimitiveNode.Function.ECAPAC)
662
 
                                textField1Label.setText("Electrolytic cap:"); else
663
 
                                        textField1Label.setText("Capacitance:");
 
667
                                textField1Label.setText("Electrolytic cap:");
 
668
                        else if (fun == PrimitiveNode.Function.POLY2CAPAC)
 
669
                                textField1Label.setText("Poly2 cap:");
 
670
            else
 
671
                            textField1Label.setText("Capacitance:");
664
672
//                      formatinfstr(infstr, x_(" (%s):"),
665
673
//                              TRANSLATE(us_capacitancenames[(us_electricalunits&INTERNALCAPUNITS) >> INTERNALCAPUNITSSH]));
666
674
                        Variable var = ni.getVar(Schematics.SCHEM_CAPACITANCE);
1019
1027
                        {
1020
1028
                                if (currentExpansion != initialExpansion)
1021
1029
                                {
1022
 
                                        if (currentExpansion) ni.setExpanded(); else
1023
 
                                                ni.clearExpanded();
 
1030
                                        ni.setExpanded(currentExpansion);
1024
1031
                                        changed = true;
1025
1032
                                        expansionChanged = true;
1026
1033
                                }
1219
1226
                                        np == Schematics.tech().resistorNode)
1220
1227
                                {
1221
1228
                                        Object width, length;
1222
 
                                        if (ni.getFunction().isFET() || ni.getFunction().isPolyOrWellResistor())
 
1229
                                        if (ni.getFunction().isFET() || ni.getFunction().isComplexResistor())
1223
1230
                                        {
1224
1231
                                                // see if we can convert width and length to a Number
1225
1232
                                                double w = TextUtils.atof(currentXSize, null);