← Back to branch summary

~ubuntu-branches/ubuntu/maverick/electric/maverick

« back to all changes in this revision

Viewing changes to com/sun/electric/tool/extract/ParasiticTool.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/extract/ParasiticTool.java
247
247
            int numRemoveParents = context.getNumLevels();
248
248
            PrimitiveNode.Function function = ni.getFunction();
249
249
            // In case of contacts, the area is substracted.
250
 
            boolean add = function != PrimitiveNode.Function.CONTACT;
 
250
            boolean add = !function.isContact();
251
251
 
252
252
            Poly [] polyList = tech.getShapeOfNode(ni, true, true, null);
253
253
            int tot = polyList.length;
448
448
 
449
449
                    if (np == Generic.tech().cellCenterNode) continue;
450
450
 
451
 
                    if (np.getFunction() == PrimitiveNode.Function.PIN) continue;
 
451
                    if (np.getFunction().isPin()) continue;
452
452
 
453
453
                    // don't check between technologies
454
454
                                        if (np.getTechnology() != tech) continue;