← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/electric/oneiric

« back to all changes in this revision

Viewing changes to com/sun/electric/tool/logicaleffort/LENetlister2.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/logicaleffort/LENetlister2.java
525
525
        else if ((ni.getProto() != null) && (ni.getProto().getFunction().isTransistor())) {
526
526
            return LENodable.Type.TRANSISTOR;
527
527
        }
528
 
        else if ((ni.getProto() != null) && (ni.getProto().getFunction() == PrimitiveNode.Function.CAPAC)) {
 
528
        else if ((ni.getProto() != null) && (ni.getProto().getFunction().isCapacitor())) {
529
529
            return LENodable.Type.CAPACITOR;
530
530
        }
531
531
        else if ((var = ni.getParameterOrVariable(ATTR_LEIGNORE)) != null) {
591
591
                    }
592
592
                    float length = VarContext.objectToFloat(info.getContext().evalVar(var), (float)2.0);
593
593
                    // not exactly correct because assumes all cap is area cap, which it isn't
594
 
                    if (length != 2.0f)
595
 
                        le = le * length / 2.0f;
 
594
                    if (length != constants.x1inverter_length)
 
595
                        le = le * length / constants.x1inverter_length;
596
596
                }
597
597
            }
598
598
            lenodable.addPort(pp.getName(), dir, le, jnet);