[mapguide-commits] r7218 - in sandbox/jng/swig-java: BuildTools/WebTools/IMake Common/Foundation/Data Common/Foundation/Exception Common/PlatformBase/Services Oem/SWIGEx/Source/Modules Oem/SWIGEx/Win32 Web/src Web/src/HttpHandler Web/src/JavaApi/org/osgeo/mapguide Web/src/JavaApiEx Web/src/JavaApiEx/org/osgeo/mapguide
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Nov 22 23:19:11 PST 2012
Author: jng
Date: 2012-11-22 23:19:11 -0800 (Thu, 22 Nov 2012)
New Revision: 7218
Modified:
sandbox/jng/swig-java/BuildTools/WebTools/IMake/IMake.cpp
sandbox/jng/swig-java/Common/Foundation/Data/PropertyDefinition.cpp
sandbox/jng/swig-java/Common/Foundation/Data/PropertyDefinition.h
sandbox/jng/swig-java/Common/Foundation/Exception/Exception.cpp
sandbox/jng/swig-java/Common/Foundation/Exception/Exception.h
sandbox/jng/swig-java/Common/PlatformBase/Services/ClassDefinition.cpp
sandbox/jng/swig-java/Common/PlatformBase/Services/ClassDefinition.h
sandbox/jng/swig-java/Common/PlatformBase/Services/FeatureSchema.cpp
sandbox/jng/swig-java/Common/PlatformBase/Services/FeatureSchema.h
sandbox/jng/swig-java/Oem/SWIGEx/Source/Modules/java.cxx
sandbox/jng/swig-java/Oem/SWIGEx/Win32/Swig.exe
sandbox/jng/swig-java/Web/src/HttpHandler/HttpUtil.cpp
sandbox/jng/swig-java/Web/src/JavaApi/org/osgeo/mapguide/AppThrowable.java
sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.vcxproj
sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java
sandbox/jng/swig-java/Web/src/WebTier_VS2010.sln
Log:
#9: More changes
- Modify swig to support 2 new arguments for the "Java" language target:
- mgjavacasing: Forces swig-generated java methods to be written in lowerCamelCase instead of the MapGuide-imposed default (UpperCamelCase)
- mgjavanothrow: Omits the "throws $baseexception" clause inserted into every java method. This only works if the AppThrowable base class extends RuntimeException (which is true for the JavaApiEx project, and false for the original JavaApi project)
- Update the JavaApiEx project to invoke swig with these 2 new arguments. The original JavaApi does not invoke swig with these arguments and thus produces the same API jar as before.
- Unfortunately, fixing the casing causes naming collisions between base java class methods and the existing MapGuide API. So the following public APIs have been renamed:
- MgException::GetStackTrace becomes MgException::GetExceptionStackTrace
- MgPropertyDefinition::Delete becomes MgPropertyDefinition::MarkDeleted
- MgClassDefinition::Delete becomes MgClassDefinition::MarkDeleted
- MgFeatureSchema::Delete becomes MgFeatureSchema::MarkDeleted
- Add a little mental note for IMake, as this is the tool we should look at modifying in order to be able to transplant some/all of the doxygen API documentation to the target language. IMake currently omits these fragments when generating "sanitized" headers for input to swig.
- Fix accidental upgrade of WebTier_VS2010.sln to VS2012
Modified: sandbox/jng/swig-java/BuildTools/WebTools/IMake/IMake.cpp
===================================================================
--- sandbox/jng/swig-java/BuildTools/WebTools/IMake/IMake.cpp 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/BuildTools/WebTools/IMake/IMake.cpp 2012-11-23 07:19:11 UTC (rev 7218)
@@ -784,6 +784,9 @@
fprintf(outfile, "package %s;\n\n", package.c_str());
}
+ //TODO: The transplanted comments are meaningless both java/csharp contexts because the the documentation
+ //format is incompatible with javadoc/.net XML documentation
+
//in translate mode, pickup the doc comments for the class, if any.
//all contiguous doc comment will be considered part of the class comment
int commentStart = i - 2;
Modified: sandbox/jng/swig-java/Common/Foundation/Data/PropertyDefinition.cpp
===================================================================
--- sandbox/jng/swig-java/Common/Foundation/Data/PropertyDefinition.cpp 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Common/Foundation/Data/PropertyDefinition.cpp 2012-11-23 07:19:11 UTC (rev 7218)
@@ -200,7 +200,7 @@
/// <returns>
/// Returns nothing.
/// </returns>
-void MgPropertyDefinition::Delete()
+void MgPropertyDefinition::MarkDeleted()
{
m_isDeleted = true;
}
Modified: sandbox/jng/swig-java/Common/Foundation/Data/PropertyDefinition.h
===================================================================
--- sandbox/jng/swig-java/Common/Foundation/Data/PropertyDefinition.h 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Common/Foundation/Data/PropertyDefinition.h 2012-11-23 07:19:11 UTC (rev 7218)
@@ -188,20 +188,23 @@
///
/// <!-- Syntax in .Net, Java, and PHP -->
/// \htmlinclude DotNetSyntaxTop.html
- /// void Delete();
+ /// void MarkDeleted();
/// \htmlinclude SyntaxBottom.html
/// \htmlinclude JavaSyntaxTop.html
- /// void Delete();
+ /// void MarkDeleted();
/// \htmlinclude SyntaxBottom.html
/// \htmlinclude PHPSyntaxTop.html
- /// void Delete();
+ /// void MarkDeleted();
/// \htmlinclude SyntaxBottom.html
///
/// \return
/// Returns nothing.
///
/// \since 2.2
- void Delete();
+ ///
+ /// \remarks
+ /// This method used to be called Delete prior to [MGOS VERSION]
+ void MarkDeleted();
EXTERNAL_API:
Modified: sandbox/jng/swig-java/Common/Foundation/Exception/Exception.cpp
===================================================================
--- sandbox/jng/swig-java/Common/Foundation/Exception/Exception.cpp 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Common/Foundation/Exception/Exception.cpp 2012-11-23 07:19:11 UTC (rev 7218)
@@ -545,7 +545,7 @@
/// \brief
/// Retrieve the formatted exception stack trace for the specified locale.
///
-STRING MgException::GetStackTrace(CREFSTRING locale) throw()
+STRING MgException::GetExceptionStackTrace(CREFSTRING locale) throw()
{
//
// Format:
@@ -593,9 +593,9 @@
/// \brief
/// Retrieve the formatted stack trace for the specified locale.
///
-STRING MgException::GetStackTrace() throw()
+STRING MgException::GetExceptionStackTrace() throw()
{
- return GetStackTrace(GetLocale());
+ return GetExceptionStackTrace(GetLocale());
}
Modified: sandbox/jng/swig-java/Common/Foundation/Exception/Exception.h
===================================================================
--- sandbox/jng/swig-java/Common/Foundation/Exception/Exception.h 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Common/Foundation/Exception/Exception.h 2012-11-23 07:19:11 UTC (rev 7218)
@@ -90,19 +90,21 @@
///
/// <!-- Syntax in .Net, Java, and PHP -->
/// \htmlinclude DotNetSyntaxTop.html
- /// string GetStackTrace() throw();
+ /// string GetExceptionStackTrace() throw();
/// \htmlinclude SyntaxBottom.html
/// \htmlinclude JavaSyntaxTop.html
- /// String GetStackTrace() throw();
+ /// String GetExceptionStackTrace() throw();
/// \htmlinclude SyntaxBottom.html
/// \htmlinclude PHPSyntaxTop.html
- /// string GetStackTrace() throw();
+ /// string GetExceptionStackTrace() throw();
/// \htmlinclude SyntaxBottom.html
///
/// \return
/// Call stack trace with method parameters
///
- STRING GetStackTrace() throw();
+ /// \remarks
+ /// This method used to be called GetStackTrace prior to [MGOS VERSION]
+ STRING GetExceptionStackTrace() throw();
EXTERNAL_API:
@@ -146,7 +148,9 @@
/// \return
/// Formatted exception stack trace
///
- STRING GetStackTrace(CREFSTRING locale) throw();
+ /// \remarks
+ /// This method used to be called GetStackTrace prior to [MGOS VERSION]
+ STRING GetExceptionStackTrace(CREFSTRING locale) throw();
///////////////////////////////////////////////////////////////////////////
/// \brief
Modified: sandbox/jng/swig-java/Common/PlatformBase/Services/ClassDefinition.cpp
===================================================================
--- sandbox/jng/swig-java/Common/PlatformBase/Services/ClassDefinition.cpp 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Common/PlatformBase/Services/ClassDefinition.cpp 2012-11-23 07:19:11 UTC (rev 7218)
@@ -396,7 +396,7 @@
/// <returns>
/// Returns nothing.
/// </returns>
-void MgClassDefinition::Delete()
+void MgClassDefinition::MarkDeleted()
{
m_isDeleted = true;
}
Modified: sandbox/jng/swig-java/Common/PlatformBase/Services/ClassDefinition.h
===================================================================
--- sandbox/jng/swig-java/Common/PlatformBase/Services/ClassDefinition.h 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Common/PlatformBase/Services/ClassDefinition.h 2012-11-23 07:19:11 UTC (rev 7218)
@@ -305,20 +305,23 @@
///
/// <!-- Syntax in .Net, Java, and PHP -->
/// \htmlinclude DotNetSyntaxTop.html
- /// void Delete();
+ /// void MarkDeleted();
/// \htmlinclude SyntaxBottom.html
/// \htmlinclude JavaSyntaxTop.html
- /// void Delete();
+ /// void MarkDeleted();
/// \htmlinclude SyntaxBottom.html
/// \htmlinclude PHPSyntaxTop.html
- /// void Delete();
+ /// void MarkDeleted();
/// \htmlinclude SyntaxBottom.html
///
/// \return
/// Returns nothing.
///
/// \since 2.2
- void Delete();
+ ///
+ /// \remarks
+ /// This method used to be called Delete prior to [MGOS VERSION]
+ void MarkDeleted();
EXTERNAL_API:
//////////////////////////////////////////////////////////////////
Modified: sandbox/jng/swig-java/Common/PlatformBase/Services/FeatureSchema.cpp
===================================================================
--- sandbox/jng/swig-java/Common/PlatformBase/Services/FeatureSchema.cpp 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Common/PlatformBase/Services/FeatureSchema.cpp 2012-11-23 07:19:11 UTC (rev 7218)
@@ -111,7 +111,7 @@
}
//////////////////////////////////////////////////////////////
-void MgFeatureSchema::Delete()
+void MgFeatureSchema::MarkDeleted()
{
m_isDeleted = true;
}
Modified: sandbox/jng/swig-java/Common/PlatformBase/Services/FeatureSchema.h
===================================================================
--- sandbox/jng/swig-java/Common/PlatformBase/Services/FeatureSchema.h 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Common/PlatformBase/Services/FeatureSchema.h 2012-11-23 07:19:11 UTC (rev 7218)
@@ -187,20 +187,23 @@
///
/// <!-- Syntax in .Net, Java, and PHP -->
/// \htmlinclude DotNetSyntaxTop.html
- /// void Delete();
+ /// void MarkDeleted();
/// \htmlinclude SyntaxBottom.html
/// \htmlinclude JavaSyntaxTop.html
- /// void Delete();
+ /// void MarkDeleted();
/// \htmlinclude SyntaxBottom.html
/// \htmlinclude PHPSyntaxTop.html
- /// void Delete();
+ /// void MarkDeleted();
/// \htmlinclude SyntaxBottom.html
///
/// \return
/// Returns nothing.
///
/// \since 2.2
- void Delete();
+ ///
+ /// \remarks
+ /// This method used to be called Delete prior to [MGOS VERSION]
+ void MarkDeleted();
INTERNAL_API:
void Dispose();
Modified: sandbox/jng/swig-java/Oem/SWIGEx/Source/Modules/java.cxx
===================================================================
--- sandbox/jng/swig-java/Oem/SWIGEx/Source/Modules/java.cxx 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Oem/SWIGEx/Source/Modules/java.cxx 2012-11-23 07:19:11 UTC (rev 7218)
@@ -62,6 +62,8 @@
bool wrapping_member_flag; // Flag for when wrapping a member variable/enum/const
bool global_variable_flag; // Flag for when wrapping a global variable
bool member_func_flag; // flag set when wrapping a member function
+ bool lower_camel_case_method_names; //Flag to determine if java method should be forced into lowerCamelCase
+ bool skip_throws_clause; //Flag to determine if throws clauses are to be omitted (assumes root exception proxy extends RuntimeException)
bool firstFuncWrapper;
@@ -136,6 +138,8 @@
global_variable_flag(false),
member_func_flag(false),
firstFuncWrapper(true),
+ lower_camel_case_method_names(false),
+ skip_throws_clause(false),
imclass_name(NULL),
module_class_name(NULL),
@@ -332,6 +336,12 @@
} else if ((strcmp(argv[i],"-noproxy") == 0)) {
Swig_mark_arg(i);
proxy_flag = false;
+ } else if ((strcmp(argv[i],"-mgjavacasing") == 0)) {
+ Swig_mark_arg(i);
+ lower_camel_case_method_names = true;
+ } else if ((strcmp(argv[i],"-mgjavanothrow") == 0)) {
+ Swig_mark_arg(i);
+ skip_throws_clause = true;
} else if ((strcmp(argv[i],"-dllname") == 0)) {
if (argv[i+1])
{
@@ -1885,6 +1895,7 @@
String *imcall = NewString("");
String *return_type = NewString("");
String *function_code = NewString("");
+ String *camelCasedName = NULL;
if(!proxy_flag) return;
@@ -1915,12 +1926,31 @@
}
/* Start generating the proxy function */
+
+ //NOTE: Not for general consumption. All MapGuide API methods are in UpperCamelCase so this simply lowercases the first letter
+ if (lower_camel_case_method_names)
+ {
+ camelCasedName = NewString("");
+ char * chOriginalName = Char(proxy_function_name);
+ if (chOriginalName && strlen(chOriginalName) > 0)
+ {
+ int i = 0;
+ Printf(camelCasedName, "%c", tolower(chOriginalName[i]));
+ i++;
+ while(chOriginalName[i] != '\0')
+ {
+ Printf(camelCasedName, "%c", chOriginalName[i]);
+ i++;
+ }
+ }
+ }
+
const String *methodmods = Getattr(n,"feature:java:methodmodifiers");
methodmods = methodmods ? methodmods : (is_protected(n) ? protected_string : public_string);
Printf(function_code, " %s ", methodmods);
if (static_flag)
Printf(function_code, "static ");
- Printf(function_code, "%s %s(", return_type, proxy_function_name);
+ Printf(function_code, "%s %s(", return_type, (camelCasedName != NULL ? camelCasedName : proxy_function_name));
Printv(imcall, imclass_name, ".", intermediary_function_name, "(", NIL);
if (!static_flag)
@@ -1992,7 +2022,7 @@
Printf(imcall, ")");
Printf(function_code, ")");
- if(baseException)
+ if(baseException && !skip_throws_clause)
Printf(function_code, " throws %s ", baseException);
// Transform return type used in JNI function (in intermediary class) to type used in Java wrapper function (in proxy class)
@@ -2022,6 +2052,11 @@
Printv(proxy_class_code, function_code, NIL);
+ if (camelCasedName != NULL) {
+ Delete(camelCasedName);
+ camelCasedName = NULL;
+ }
+
Delete(function_code);
Delete(return_type);
Delete(imcall);
@@ -3604,6 +3639,8 @@
-package <name> - set name of the Java package to <name>\n\
-noproxy - Generate the low-level functional interface instead\n\
of proxy classes\n\
+ -mgjavanothrow - Omit the throws clause in Java wrapper methods (root proxy exception class must extend RuntimeException)\n\
+ -mgjavacasing - Force java methods to be written in lowerCamelCase\n\
-root <name> - set the name of the root class\n\
-dllname <name> - set the name of JNI dll\n\
\n";
Modified: sandbox/jng/swig-java/Oem/SWIGEx/Win32/Swig.exe
===================================================================
(Binary files differ)
Modified: sandbox/jng/swig-java/Web/src/HttpHandler/HttpUtil.cpp
===================================================================
--- sandbox/jng/swig-java/Web/src/HttpHandler/HttpUtil.cpp 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Web/src/HttpHandler/HttpUtil.cpp 2012-11-23 07:19:11 UTC (rev 7218)
@@ -50,7 +50,7 @@
STRING strCurrentTime = currentTime.ToXmlString(false);
STRING message = exception->GetExceptionMessage();
- STRING stackTrace = exception->GetStackTrace();
+ STRING stackTrace = exception->GetExceptionStackTrace();
ACE_OS::fprintf(fp, ACE_TEXT("<%s>\n"), MG_WCHAR_TO_TCHAR(strCurrentTime));
ACE_OS::fprintf(fp, ACE_TEXT(" Error: %s\n"), MG_WCHAR_TO_TCHAR(message));
Modified: sandbox/jng/swig-java/Web/src/JavaApi/org/osgeo/mapguide/AppThrowable.java
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApi/org/osgeo/mapguide/AppThrowable.java 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Web/src/JavaApi/org/osgeo/mapguide/AppThrowable.java 2012-11-23 07:19:11 UTC (rev 7218)
@@ -43,7 +43,7 @@
{
try
{
- System.out.println(((MgException)this).GetStackTrace());
+ System.out.println(((MgException)this).GetExceptionStackTrace());
}
catch (MgException e)
{
Modified: sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.vcxproj 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.vcxproj 2012-11-23 07:19:11 UTC (rev 7218)
@@ -92,7 +92,7 @@
<Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApid -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -131,7 +131,7 @@
<Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApid -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -170,7 +170,7 @@
<Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApi -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -209,7 +209,7 @@
<Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
Modified: sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java 2012-11-23 07:19:11 UTC (rev 7218)
@@ -31,7 +31,7 @@
{
try
{
- return ((MgException)this).GetExceptionMessage();
+ return ((MgException)this).getExceptionMessage();
}
catch (MgException e)
{
@@ -43,7 +43,7 @@
{
try
{
- System.out.println(((MgException)this).GetStackTrace());
+ System.out.println(((MgException)this).getExceptionStackTrace());
}
catch (MgException e)
{
Modified: sandbox/jng/swig-java/Web/src/WebTier_VS2010.sln
===================================================================
--- sandbox/jng/swig-java/Web/src/WebTier_VS2010.sln 2012-11-23 05:34:27 UTC (rev 7217)
+++ sandbox/jng/swig-java/Web/src/WebTier_VS2010.sln 2012-11-23 07:19:11 UTC (rev 7218)
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CgiAgent", "CgiAgent\CgiAgent.vcxproj", "{DA3459C2-1430-499F-996F-218DA3DD755D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "..\..\Common\Foundation\Foundation.vcxproj", "{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}"
More information about the mapguide-commits
mailing list