Index: freeform/manifest.mf
===================================================================
RCS file: /cvs/java/freeform/manifest.mf,v
retrieving revision 1.8
diff -u -r1.8 manifest.mf
--- freeform/manifest.mf	12 Dec 2005 15:38:38 -0000	1.8
+++ freeform/manifest.mf	9 Oct 2006 14:02:50 -0000
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.java.freeform/1
-OpenIDE-Module-Specification-Version: 1.6
+OpenIDE-Module-Specification-Version: 1.7
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/freeform/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/java/freeform/resources/layer.xml
 
Index: freeform/nbproject/project.xml
===================================================================
RCS file: /cvs/java/freeform/nbproject/project.xml,v
retrieving revision 1.16
diff -u -r1.16 project.xml
--- freeform/nbproject/project.xml	15 Aug 2006 16:10:51 -0000	1.16
+++ freeform/nbproject/project.xml	9 Oct 2006 14:02:50 -0000
@@ -47,7 +47,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.8</specification-version>
+                        <specification-version>1.13</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
Index: freeform/src/org/netbeans/modules/java/freeform/LookupMergerImpl.java
===================================================================
RCS file: /cvs/java/freeform/src/org/netbeans/modules/java/freeform/LookupMergerImpl.java,v
retrieving revision 1.3
diff -u -r1.3 LookupMergerImpl.java
--- freeform/src/org/netbeans/modules/java/freeform/LookupMergerImpl.java	2 Sep 2006 07:48:59 -0000	1.3
+++ freeform/src/org/netbeans/modules/java/freeform/LookupMergerImpl.java	9 Oct 2006 14:02:50 -0000
@@ -20,8 +20,8 @@
 package org.netbeans.modules.java.freeform;
 
 import org.netbeans.api.java.classpath.ClassPath;
-import org.netbeans.modules.ant.freeform.spi.LookupMerger;
 import org.netbeans.spi.java.classpath.ClassPathProvider;
+import org.netbeans.spi.project.LookupMerger;
 import org.openide.filesystems.FileObject;
 import org.openide.util.Lookup;
 
@@ -30,19 +30,16 @@
  *
  * @author David Konecny
  */
-public class LookupMergerImpl implements LookupMerger {
+public class LookupMergerImpl implements LookupMerger<ClassPathProvider> {
 
     public LookupMergerImpl() {}
 
-    public Class<?>[] getMergeableClasses() {
-        return new Class<?>[] {ClassPathProvider.class};
+    public Class<ClassPathProvider> getMergeableClass() {
+        return ClassPathProvider.class;
     }
-    
-    public Object merge(Lookup lookup, Class clazz) {
-        if (clazz == ClassPathProvider.class) {
-            return new ClassPathProviderImpl(lookup);
-        }
-        throw new IllegalArgumentException("merging of "+clazz+" is not supported"); // NOI18N
+
+    public ClassPathProvider merge(Lookup lookup) {
+        return new ClassPathProviderImpl(lookup);
     }
     
     private static class ClassPathProviderImpl implements ClassPathProvider {