1 files changed, 37 insertions, 34 deletions

diff --git a/Source/cmVTKWrapJavaCommand.cxx b/Source/cmVTKWrapJavaCommand.cxx
index f20bbc35a4..3202169955 100644
--- a/Source/cmVTKWrapJavaCommand.cxx
+++ b/Source/cmVTKWrapJavaCommand.cxx
@@ -25,24 +25,24 @@ bool cmVTKWrapJavaCommand::InitialPass(std::vector<std::string> const& argsIn)
     return false;
     }
   std::vector<std::string> args;
-  m_Makefile->ExpandSourceListArguments(argsIn, args, 2);
+  this->Makefile->ExpandSourceListArguments(argsIn, args, 2);
 
   // Now check and see if the value has been stored in the cache
   // already, if so use that value and don't look for the program
-  if(!m_Makefile->IsOn("VTK_WRAP_JAVA"))
+  if(!this->Makefile->IsOn("VTK_WRAP_JAVA"))
     {
     return true;
     }
 
   // what is the current source dir
-  std::string cdir = m_Makefile->GetCurrentDirectory();
+  std::string cdir = this->Makefile->GetCurrentDirectory();
 
   // keep the library name
-  m_LibraryName = args[0];
-  m_SourceList = args[1];
+  this->LibraryName = args[0];
+  this->SourceList = args[1];
   std::string sourceListValue;
   // was the list already populated
-  const char *def = m_Makefile->GetDefinition(m_SourceList.c_str());  
+  const char *def = this->Makefile->GetDefinition(this->SourceList.c_str());  
   if (def)
     {
     sourceListValue = def;
@@ -50,8 +50,9 @@ bool cmVTKWrapJavaCommand::InitialPass(std::vector<std::string> const& argsIn)
   
   // Prepare java dependency file
   const char* resultDirectory = 
-    m_Makefile->GetRequiredDefinition("VTK_JAVA_HOME");
-  std::string res = m_Makefile->GetCurrentOutputDirectory();
+          this->Makefile->GetRequiredDefinition("VTK_JAVA_HOME");
+  std::string res = this->Makefile->GetCurrentOutputDirectory();
+
   std::string depFileName = res + "/JavaDependencies.cmake";
   std::ofstream depFile(depFileName.c_str());
   depFile << "# This file is automatically generated by CMake VTK_WRAP_JAVA" 
@@ -62,7 +63,7 @@ bool cmVTKWrapJavaCommand::InitialPass(std::vector<std::string> const& argsIn)
   for(std::vector<std::string>::const_iterator j = (args.begin() + 2);
       j != args.end(); ++j)
     {   
-    cmSourceFile *curr = m_Makefile->GetSource(j->c_str());
+    cmSourceFile *curr = this->Makefile->GetSource(j->c_str());
 
     // if we should wrap the class
     if (!curr || !curr->GetPropertyAsBool("WRAP_EXCLUDE"))
@@ -74,14 +75,14 @@ bool cmVTKWrapJavaCommand::InitialPass(std::vector<std::string> const& argsIn)
         }
       std::string srcName = cmSystemTools::GetFilenameWithoutExtension(*j);
       std::string newName = srcName + "Java";
-      file.SetName(newName.c_str(), m_Makefile->GetCurrentOutputDirectory(),
+      file.SetName(newName.c_str(), this->Makefile->GetCurrentOutputDirectory(),
                    "cxx",false);
       std::string hname = cdir + "/" + srcName + ".h";
-      m_WrapHeaders.push_back(hname);
+      this->WrapHeaders.push_back(hname);
       // add starting depends
       file.GetDepends().push_back(hname);
-      m_WrapClasses.push_back(file);
-      m_OriginalNames.push_back(srcName);
+      this->WrapClasses.push_back(file);
+      this->OriginalNames.push_back(srcName);
       if (sourceListValue.size() > 0)
         {
         sourceListValue += ";";
@@ -100,22 +101,24 @@ bool cmVTKWrapJavaCommand::InitialPass(std::vector<std::string> const& argsIn)
   // Finalize java dependency file
   depFile << ")" << std::endl;
   
-  m_Makefile->AddDefinition(m_SourceList.c_str(), sourceListValue.c_str());  
+  this->Makefile->AddDefinition(this->SourceList.c_str(), sourceListValue.c_str());  
   return true;
 }
 
 void cmVTKWrapJavaCommand::FinalPass() 
 {
   // first we add the rules for all the .h to Java.cxx files
-  size_t lastClass = m_WrapClasses.size();
+  size_t lastClass = this->WrapClasses.size();
   std::vector<std::string> depends;
   std::vector<std::string> depends2;
   std::vector<std::string> alldepends;  
-  const char* wjava = m_Makefile->GetRequiredDefinition("VTK_WRAP_JAVA_EXE");
-  const char* pjava = m_Makefile->GetRequiredDefinition("VTK_PARSE_JAVA_EXE");
-  const char* hints = m_Makefile->GetDefinition("VTK_WRAP_HINTS");
+  const char* wjava = 
+    this->Makefile->GetRequiredDefinition("VTK_WRAP_JAVA_EXE");
+  const char* pjava = 
+    this->Makefile->GetRequiredDefinition("VTK_PARSE_JAVA_EXE");
+  const char* hints = this->Makefile->GetDefinition("VTK_WRAP_HINTS");
   const char* resultDirectory = 
-    m_Makefile->GetRequiredDefinition("VTK_JAVA_HOME");
+    this->Makefile->GetRequiredDefinition("VTK_JAVA_HOME");
 
   // wrap all the .h files
   depends.push_back(wjava);
@@ -127,26 +130,26 @@ void cmVTKWrapJavaCommand::FinalPass()
     }
   for(size_t classNum = 0; classNum < lastClass; classNum++)
     {
-    m_Makefile->AddSource(m_WrapClasses[classNum]);
+    this->Makefile->AddSource(this->WrapClasses[classNum]);
 
     // wrap java
-    std::string res = m_Makefile->GetCurrentOutputDirectory();
+    std::string res = this->Makefile->GetCurrentOutputDirectory();
     res += "/";
-    res += m_WrapClasses[classNum].GetSourceName() + ".cxx";
+    res += this->WrapClasses[classNum].GetSourceName() + ".cxx";
     std::string res2 = resultDirectory;
     res2 += "/";
-    res2 += m_OriginalNames[classNum];
+    res2 += this->OriginalNames[classNum];
     res2 += ".java";
     
     cmCustomCommandLine commandLineW;
     commandLineW.push_back(wjava);
-    commandLineW.push_back(m_WrapHeaders[classNum]);
+    commandLineW.push_back(this->WrapHeaders[classNum]);
     if(hints)
       {
       commandLineW.push_back(hints);
       }
-    commandLineW.push_back(
-      (m_WrapClasses[classNum].GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
+    commandLineW.push_back((this->WrapClasses[classNum].
+                            GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
     commandLineW.push_back(res);
 
     cmCustomCommandLines commandLines;
@@ -154,32 +157,32 @@ void cmVTKWrapJavaCommand::FinalPass()
     std::vector<std::string> outputs;
     outputs.push_back(res);
     const char* no_comment = 0;
-    m_Makefile->AddCustomCommandOldStyle(m_LibraryName.c_str(),
+    this->Makefile->AddCustomCommandOldStyle(this->LibraryName.c_str(),
                                          outputs,
                                          depends,
-                                         m_WrapHeaders[classNum].c_str(),
+                                         this->WrapHeaders[classNum].c_str(),
                                          commandLines,
                                          no_comment);
 
     cmCustomCommandLine commandLineP;
     commandLineP.push_back(pjava);
-    commandLineP.push_back(m_WrapHeaders[classNum]);
+    commandLineP.push_back(this->WrapHeaders[classNum]);
     if(hints)
       {
       commandLineP.push_back(hints);
       }
-    commandLineP.push_back(
-      (m_WrapClasses[classNum].GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
+    commandLineP.push_back((this->WrapClasses[classNum].
+                            GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
     commandLineP.push_back(res2);
 
     cmCustomCommandLines commandLines2;
     commandLines2.push_back(commandLineP);
     std::vector<std::string> outputs2;
     outputs2.push_back(res2);
-    m_Makefile->AddCustomCommandOldStyle(m_LibraryName.c_str(),
+    this->Makefile->AddCustomCommandOldStyle(this->LibraryName.c_str(),
                                          outputs2,
                                          depends2,
-                                         m_WrapHeaders[classNum].c_str(),
+                                         this->WrapHeaders[classNum].c_str(),
                                          commandLines2,
                                          no_comment);
     alldepends.push_back(res2);
@@ -187,7 +190,7 @@ void cmVTKWrapJavaCommand::FinalPass()
 
   const char* no_output = 0;
   const char* no_working_directory = 0;
-  m_Makefile->AddUtilityCommand((m_LibraryName+"JavaClasses").c_str(),
+  this->Makefile->AddUtilityCommand((this->LibraryName+"JavaClasses").c_str(),
                                 true, no_output, 
                                 alldepends, no_working_directory, "");
 }