← Back to branch summary

~ubuntu-branches/ubuntu/wily/aspectj/wily-proposed

« back to all changes in this revision

Viewing changes to org.aspectj/modules/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java

  • Committer: Bazaar Package Importer
  • Author(s): Damien Raude-Morvan
  • Date: 2011-03-15 23:54:31 UTC
  • mfrom: (1.2.5 upstream)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20110315235431-iq2gxbsx08kpwuiw
* New upstream release.
* Updated Standards-Version to 3.9.1 (no changes needed).
* Fix local Javadoc links:
  - d/patches/07_javadoc_links.diff: Use locally installed
   javadoc packages and hyperlink with them.
  - d/control: Add B-D on default-java-doc and libasm3-java-doc.
* d/control: Drop B-D on itself (our new bootstrap infrastructure doesn't need
  that anymore).
* Split packages into :
  - aspectj: only contains CLI tools.
  - libaspectj-java: JAR librairies for /usr/share/java.
  - libaspectj-java-doc: 4 API's Javadoc.
  - aspectj-doc: Programming Guides and SDK Documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
org.aspectj/modules/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
32
32
 
33
33
import org.aspectj.bridge.AbortException;
34
34
import org.aspectj.bridge.IMessage;
 
35
import org.aspectj.bridge.IMessage.Kind;
35
36
import org.aspectj.bridge.IMessageContext;
36
37
import org.aspectj.bridge.IMessageHandler;
37
38
import org.aspectj.bridge.IMessageHolder;
41
42
import org.aspectj.bridge.MessageWriter;
42
43
import org.aspectj.bridge.Version;
43
44
import org.aspectj.bridge.WeaveMessage;
44
 
import org.aspectj.bridge.IMessage.Kind;
45
45
import org.aspectj.util.FileUtil;
46
46
import org.aspectj.util.LangUtil;
47
47
import org.aspectj.weaver.IClassFileProvider;
443
443
        // spe.printStackTrace();
444
444
        // return false;
445
445
        // }
446
 
        //          
 
446
        //
447
447
        // return detector.isAspect();
448
448
        // }
449
449
 
603
603
        protected class WeavingAdaptorMessageHolder extends MessageHandler {
604
604
 
605
605
                private IMessageHandler delegate;
606
 
                private List savedMessages;
 
606
                private List<IMessage> savedMessages;
607
607
 
608
608
                protected boolean traceMessages = Boolean.getBoolean(TRACE_MESSAGES_PROPERTY);
609
609
 
639
639
 
640
640
                public void flushMessages() {
641
641
                        if (savedMessages == null) {
642
 
                                savedMessages = new ArrayList();
 
642
                                savedMessages = new ArrayList<IMessage>();
643
643
                                savedMessages.addAll(super.getUnmodifiableListView());
644
644
                                clearMessages();
645
 
                                for (Iterator iter = savedMessages.iterator(); iter.hasNext();) {
646
 
                                        IMessage message = (IMessage) iter.next();
 
645
                                for (IMessage message : savedMessages) {
647
646
                                        delegate.handleMessage(message);
648
647
                                }
649
648
                        }
709
708
                 */
710
709
 
711
710
                @Override
712
 
                public List getUnmodifiableListView() {
 
711
                public List<IMessage> getUnmodifiableListView() {
713
712
                        // System.err.println("? WeavingAdaptorMessageHolder.getUnmodifiableListView() savedMessages=" + savedMessages);
714
 
                        List allMessages = new ArrayList();
 
713
                        List<IMessage> allMessages = new ArrayList<IMessage>();
715
714
                        allMessages.addAll(savedMessages);
716
715
                        allMessages.addAll(super.getUnmodifiableListView());
717
716
                        return allMessages;
720
719
 
721
720
        protected class WeavingAdaptorMessageWriter extends MessageWriter {
722
721
 
723
 
                private final Set ignoring = new HashSet();
 
722
                private final Set<IMessage.Kind> ignoring = new HashSet<IMessage.Kind>();
724
723
                private final IMessage.Kind failKind;
725
724
 
726
725
                public WeavingAdaptorMessageWriter(PrintWriter writer) {
776
775
        private class WeavingClassFileProvider implements IClassFileProvider {
777
776
 
778
777
                private final UnwovenClassFile unwovenClass;
779
 
                private final List unwovenClasses = new ArrayList(); /* List<UnovenClassFile> */
 
778
                private final List<UnwovenClassFile> unwovenClasses = new ArrayList<UnwovenClassFile>();
780
779
                private IUnwovenClassFile wovenClass;
781
780
                private boolean isApplyAtAspectJMungersOnly = false;
782
781
 
807
806
                        }
808
807
                }
809
808
 
810
 
                public Iterator getClassFileIterator() {
 
809
                public Iterator<UnwovenClassFile> getClassFileIterator() {
811
810
                        return unwovenClasses.iterator();
812
811
                }
813
812