* Gui/ProjectConfigurationPropertyPanel.cs, JavaLanguageBinding.cs,

  JavaBinding.addin.xml, JavaBinding.mdp, JavaBinding.mds,
  IKVMCompilerManager.cs, gtk-gui/gui.stetic: New project model
  changes.

svn path=/trunk/monodevelop/; revision=103660

8 files changed, 43 insertions, 32 deletions

diff --git a/extras/JavaBinding/ChangeLog b/extras/JavaBinding/ChangeLog
index ab511b8927..83a0d0987b 100644
--- a/extras/JavaBinding/ChangeLog
+++ b/extras/JavaBinding/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-21  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* Gui/ProjectConfigurationPropertyPanel.cs, JavaLanguageBinding.cs,
+	  JavaBinding.addin.xml, JavaBinding.mdp, JavaBinding.mds,
+	  IKVMCompilerManager.cs, gtk-gui/gui.stetic: New project model
+	  changes.
+
 2008-05-08  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* JavaBinding.addin.xml: Set "isText" attribute on the mimetype
diff --git a/extras/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs b/extras/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs
index 1b4ba980ce..861dec0189 100644
--- a/extras/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs
+++ b/extras/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs
@@ -22,26 +22,29 @@ using System;
 using Gtk;
 
 using MonoDevelop.Projects;
-using MonoDevelop.Core.Gui.Dialogs;
+using MonoDevelop.Projects.Gui.Dialogs;
 using MonoDevelop.Components;
 using MonoDevelop.Core;
 
 namespace JavaBinding
 {
-	public class ProjectConfigurationPropertyPanel : AbstractOptionPanel
+	public class ProjectConfigurationPropertyPanel : MultiConfigItemOptionsPanel
 	{
 		CodeGenerationPanelWidget widget;
 		
-		public override void LoadPanelContents()
+		public override Widget CreatePanelWidget()
 		{
-			Add (widget = new  CodeGenerationPanelWidget ((Properties) CustomizationObject));
+			return (widget = new CodeGenerationPanelWidget (ConfigurationData));
 		}
 		
-		public override bool StorePanelContents()
+		public override void LoadConfigData ()
 		{
-			bool result = true;
-			result = widget.Store ();
- 			return result;
+			widget.LoadConfigData (this);
+		}
+		
+		public override void ApplyChanges ()
+		{
+			widget.Store ();
 		}
 	}
 
@@ -49,14 +52,12 @@ namespace JavaBinding
 	{
 		JavaCompilerParameters compilerParameters = null;
 		DotNetProjectConfiguration configuration;
+		DotNetProject project;
 		
-		public CodeGenerationPanelWidget (Properties CustomizationObject)
+		public CodeGenerationPanelWidget (ConfigurationData configData)
 		{	
 			Build ();
 			
-			configuration = ((Properties)CustomizationObject).Get<DotNetProjectConfiguration> ("Config");
-			compilerParameters = (JavaCompilerParameters) configuration.CompilationParameters;
-			
 			ListStore store = new ListStore (typeof (string));
 			store.AppendValues (GettextCatalog.GetString ("Executable"));
 			store.AppendValues (GettextCatalog.GetString ("Library"));
@@ -64,15 +65,23 @@ namespace JavaBinding
 			CellRendererText cr = new CellRendererText ();
 			compileTargetCombo.PackStart (cr, true);
 			compileTargetCombo.AddAttribute (cr, "text", 0);
+				
+			compilerJavacButton.Toggled += new EventHandler (OnCompilerToggled);
+			compilerGcjButton.Toggled += new EventHandler (OnCompilerToggled);
+		}
+		
+		public void LoadConfigData (ProjectConfigurationPropertyPanel dlg)
+		{	
+			configuration = (DotNetProjectConfiguration) dlg.CurrentConfiguration;
+			project = (DotNetProject) dlg.ConfiguredProject;
+			compilerParameters = (JavaCompilerParameters) configuration.CompilationParameters;
+
 			compileTargetCombo.Active = (int) configuration.CompileTarget;
 
 			if (compilerParameters.Compiler == JavaCompiler.Javac)
 				compilerJavacButton.Active = true;
 			else
 				compilerGcjButton.Active = true;
-				
-			compilerJavacButton.Toggled += new EventHandler (OnCompilerToggled);
-			compilerGcjButton.Toggled += new EventHandler (OnCompilerToggled);
 
 			enableOptimizationCheckButton.Active = compilerParameters.Optimize;
 			generateDebugInformationCheckButton.Active = configuration.DebugMode;
@@ -105,7 +114,7 @@ namespace JavaBinding
 			else
 				compilerParameters.Compiler = JavaCompiler.Gcj;
 
-			configuration.CompileTarget = (CompileTarget) compileTargetCombo.Active;
+			project.CompileTarget = (CompileTarget) compileTargetCombo.Active;
 			compilerParameters.GenWarnings = generateWarningsCheckButton.Active;			
 			compilerParameters.Deprecation = deprecationCheckButton.Active;			
 			configuration.DebugMode = generateDebugInformationCheckButton.Active;			
diff --git a/extras/JavaBinding/IKVMCompilerManager.cs b/extras/JavaBinding/IKVMCompilerManager.cs
index 55f3eb0d40..35ff2b9942 100644
--- a/extras/JavaBinding/IKVMCompilerManager.cs
+++ b/extras/JavaBinding/IKVMCompilerManager.cs
@@ -128,7 +128,7 @@ namespace JavaBinding
 		static string GenerateReferenceStub (IProgressMonitor monitor,DotNetProjectConfiguration configuration, ProjectReference reference)
 		{
 			StringBuilder result = new StringBuilder ();
-			foreach (string fileName in reference.GetReferencedFileNames ()) {
+			foreach (string fileName in reference.GetReferencedFileNames (configuration.Id)) {
 				string name = Path.GetFileNameWithoutExtension (Path.GetFileName (fileName));
 				string outputName = Path.Combine (configuration.OutputDirectory, name + ".jar");
 				if (!System.IO.File.Exists (outputName)) {
@@ -187,13 +187,13 @@ namespace JavaBinding
 			
 			if (references != null) {
 				foreach (ProjectReference lib in references) {
-					foreach (string fileName in lib.GetReferencedFileNames ()) {
+					foreach (string fileName in lib.GetReferencedFileNames (configuration.Id)) {
 						args.Append (" -r:"); args.Append (fileName);
 					}
 				}
 			}
 			
-			foreach (string fileName in new ProjectReference(ReferenceType.Gac, "mscorlib").GetReferencedFileNames ()) {
+			foreach (string fileName in new ProjectReference(ReferenceType.Gac, "mscorlib").GetReferencedFileNames (configuration.Id)) {
 				args.Append (" -r:"); args.Append (fileName);
 			}
 			
diff --git a/extras/JavaBinding/JavaBinding.addin.xml b/extras/JavaBinding/JavaBinding.addin.xml
index 80a77ff35a..536f4fd78b 100644
--- a/extras/JavaBinding/JavaBinding.addin.xml
+++ b/extras/JavaBinding/JavaBinding.addin.xml
@@ -50,12 +50,12 @@
     <ProjectTemplate id = "IkvmLibraryProject" resource = "IkvmLibraryProject.xpt.xml"/>
   </Extension>
 
-  <Extension path = "/MonoDevelop/ProjectModel/Gui/ProjectOptions/ConfigurationOptions">
+  <Extension path = "/MonoDevelop/ProjectModel/Gui/ProjectOptions">
     <Condition id="activelanguage" value = "Java">
-      <DialogPanel id = "JavaProjectPanel"
+      <Section id = "JavaProjectPanel"
                    _label = "Code Generation"
                    class = "JavaBinding.ProjectConfigurationPropertyPanel"/>
-	  <DialogPanel id = "JavaOutputOptionsPanel"
+	  <Section id = "JavaOutputOptionsPanel"
 				 _label = "Output"
 				 class = "MonoDevelop.Projects.Gui.Dialogs.OptionPanels.OutputOptionsPanel"/>
     </Condition>
diff --git a/extras/JavaBinding/JavaBinding.mdp b/extras/JavaBinding/JavaBinding.mdp
index 49562fc9f0..f2f1855ad9 100644
--- a/extras/JavaBinding/JavaBinding.mdp
+++ b/extras/JavaBinding/JavaBinding.mdp
@@ -4,13 +4,13 @@
       <Output directory="build" assembly="JavaBinding" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
-      <CodeGeneration compiler="Csc" warninglevel="3" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+      <CodeGeneration compiler="Mcs" warninglevel="3" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
       <Output directory="build" assembly="JavaBinding" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
-      <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
   <Contents>
@@ -64,6 +64,8 @@
     <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.TextEditor, Version=1.0.3020.20447, Culture=neutral, PublicKeyToken=null" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Debugging, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
   </References>
   <Deployment.LinuxDeployData generatePcFile="False" />
   <GtkDesignInfo gettextClass="Mono.Addins.AddinManager.CurrentLocalizer" gtkVersion="2.8.3" />
diff --git a/extras/JavaBinding/JavaBinding.mds b/extras/JavaBinding/JavaBinding.mds
index 5efe56a456..748365ba21 100644
--- a/extras/JavaBinding/JavaBinding.mds
+++ b/extras/JavaBinding/JavaBinding.mds
@@ -12,7 +12,6 @@
   <StartMode startupentry="JavaBinding" single="True">
     <Execute type="None" entry="JavaBinding" />
     <Execute type="None" entry="po" />
-    <Execute type="None" entry="packs" />
   </StartMode>
   <Entries>
     <Entry filename="JavaBinding.mdp" />
diff --git a/extras/JavaBinding/JavaLanguageBinding.cs b/extras/JavaBinding/JavaLanguageBinding.cs
index 443b4e7fee..d996d1b7a7 100644
--- a/extras/JavaBinding/JavaLanguageBinding.cs
+++ b/extras/JavaBinding/JavaLanguageBinding.cs
@@ -63,12 +63,6 @@ namespace JavaBinding
 			return IKVMCompilerManager.Compile (projectFiles, references, configuration, monitor);
 		}
 		
-		public void GenerateMakefile (Project project, Combine parentCombine)
-		{
-			// FIXME: dont abort for now
-			// throw new NotImplementedException ();
-		}
-		
 		public ICloneable CreateCompilationParameters (XmlElement projectOptions)
 		{
 			JavaCompilerParameters parameters = new JavaCompilerParameters ();
diff --git a/extras/JavaBinding/gtk-gui/gui.stetic b/extras/JavaBinding/gtk-gui/gui.stetic
index 47022dbcec..8cdef1a55a 100644
--- a/extras/JavaBinding/gtk-gui/gui.stetic
+++ b/extras/JavaBinding/gtk-gui/gui.stetic
@@ -8,6 +8,7 @@
     <widget-library name="MonoDevelop.Components, Version=0.19.0.0, Culture=neutral" />
     <widget-library name="MonoDevelop.Ide, Version=0.19.0.0, Culture=neutral" />
     <widget-library name="MonoDevelop.Projects.Gui, Version=0.19.0.0, Culture=neutral" />
+    <widget-library name="Mono.TextEditor, Version=1.0.3020.20447, Culture=neutral" />
   </import>
   <widget class="Gtk.Bin" id="JavaBinding.CodeGenerationPanelWidget" design-size="600 410">
     <property name="MemberName" />
@@ -297,7 +298,6 @@
                       <widget class="Gtk.RadioButton" id="compilerGcjButton">
                         <property name="MemberName" />
                         <property name="Label" translatable="yes">gcj</property>
-                        <property name="Active">True</property>
                         <property name="DrawIndicator">True</property>
                         <property name="HasLabel">True</property>
                         <property name="UseUnderline">True</property>