Skip to content

C
core
Kaydet (Commit) c6ee6abe authored tarafından Joachim Lingner's avatar Joachim Lingner
Dosyalara gözat
Seçenekler

#i20052#

üst f17a9b4b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 71 deletions
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
Dosyayı görüntüle @ c6ee6abe
......@@ -2,9 +2,9 @@
*
* $RCSfile: sunjavaplugin.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: jl $ $Date: 2004-04-22 12:52:39 $
* last change: $Author: jl $ $Date: 2004-04-27 15:22:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -152,7 +152,7 @@ javaPluginError getAllJavaInfos( rtl_uString *sMinVersion,
typedef std::vector<stoc_javadetect::JavaInfo>::iterator cit;
for (cit i = vec.begin(); i != vec.end(); i++, j++)
{
arInfo[j] = (JavaInfo*) rtl_allocateMemory(sizeof JavaInfo);
arInfo[j] = (JavaInfo*) rtl_allocateMemory(sizeof(JavaInfo));
JavaInfo* pInfo = arInfo[j];
pInfo->sVendor = sVendor.pData;
rtl_uString_acquire(sVendor.pData);
......
jvmfwk/source/elements.cxx
Dosyayı görüntüle @ c6ee6abe
This diff is collapsed.
jvmfwk/source/framework.cxx
Dosyayı görüntüle @ c6ee6abe
......@@ -2,9 +2,9 @@
*
* $RCSfile: framework.cxx,v $
*
* $Revision: 1.9 $
* $Revision: 1.10 $
*
* last change: $Author: jl $ $Date: 2004-04-26 15:52:15 $
* last change: $Author: jl $ $Date: 2004-04-27 15:22:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -69,7 +69,7 @@
#include "osl/mutex.hxx"
#include "libxml/parser.h"
#include "libxml/xpath.h"
#include "libxml/xpathinternals.h"
#include "libxml/xpathInternals.h"
#include <vector>
#include <algorithm>
#include <functional>
......@@ -90,6 +90,12 @@
namespace {
JavaVM * g_pJavaVM = NULL;
sal_Bool SAL_CALL areEqualJavaInfo(
JavaInfo const * pInfoA,JavaInfo const * pInfoB)
{
return jfw_areEqualJavaInfo(pInfoA, pInfoB);
}
}
javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSize)
......@@ -101,13 +107,13 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
//Prepare the xml document and context
rtl::OString sSettingsPath = jfw::getVendorSettingsPath();
jfw::CXmlDocPtr doc = xmlParseFile(sSettingsPath.getStr());
jfw::CXmlDocPtr doc(xmlParseFile(sSettingsPath.getStr()));
if (doc == NULL)
{
OSL_ASSERT(0);
return JFW_E_ERROR;
}
jfw::CXPathContextPtr context = xmlXPathNewContext(doc);
jfw::CXPathContextPtr context(xmlXPathNewContext(doc));
int reg = xmlXPathRegisterNs(context, (xmlChar*) "jf",
(xmlChar*) NS_JAVA_FRAMEWORK);
if (reg == -1)
......@@ -212,11 +218,11 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
return JFW_E_ERROR;
}
typedef std::vector<rtl::OString>::const_iterator citLoc;
for (citLoc i = vecJRELocations.begin();
i != vecJRELocations.end(); i++)
for (citLoc ii = vecJRELocations.begin();
ii != vecJRELocations.end(); ii++)
{
rtl::OUString sLocation =
rtl::OStringToOUString(*i, RTL_TEXTENCODING_UTF8);
rtl::OStringToOUString(*ii, RTL_TEXTENCODING_UTF8);
JavaInfo* pInfo = NULL;
plerr = (*getJavaInfoByPathFunc)(
sLocation.pData,
......@@ -243,11 +249,11 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
//Check which JavaInfo from vector vecInfoManual is already
//contained in vecInfo. If it already exists then remove it from
//vecInfoManual
for (it_info i = vecInfo.begin(); i != vecInfo.end(); i++)
for (it_info j = vecInfo.begin(); j != vecInfo.end(); j++)
{
it_info it_duplicate =
std::find_if(vecInfoManual.begin(), vecInfoManual.end(),
std::bind2nd(std::ptr_fun(jfw_areEqualJavaInfo), *i));
std::bind2nd(std::ptr_fun(areEqualJavaInfo), *j));
if (it_duplicate != vecInfoManual.end())
vecInfoManual.erase(it_duplicate);
}
......@@ -264,11 +270,11 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
typedef std::vector<JavaInfo*>::iterator it;
int index = 0;
//Add the automatically detected JREs
for (it i = vecInfo.begin(); i != vecInfo.end(); i++)
(*pparInfo)[index++] = *i;
for (it k = vecInfo.begin(); k != vecInfo.end(); k++)
(*pparInfo)[index++] = *k;
//Add the manually detected JREs
for (it i = vecInfoManual.begin();i != vecInfoManual.end(); i++)
(*pparInfo)[index++] = *i;
for (it l = vecInfoManual.begin(); l != vecInfoManual.end(); l++)
(*pparInfo)[index++] = *l;
*pSize = nSize;
return errcode;
......@@ -292,7 +298,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
return errcode;
//get the current java setting (javaInfo)
jfw::CJavaInfo aInfo = javaSettings.getJavaInfo();
jfw::CJavaInfo aInfo(javaSettings.getJavaInfo());
//check if a Java has ever been selected
if (aInfo == NULL)
return JFW_E_NO_SELECT;
......@@ -390,10 +396,10 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
index ++;
}
//add all options of the arOptions argument
for (int i = 0; i < cOptions; i++)
for (int ii = 0; ii < cOptions; ii++)
{
arOpt[index].optionString = arOptions[i].optionString;
arOpt[index].extraInfo = arOptions[i].extraInfo;
arOpt[index].optionString = arOptions[ii].optionString;
arOpt[index].extraInfo = arOptions[ii].extraInfo;
index++;
}
//start Java
......@@ -425,13 +431,13 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
jfw::CJavaInfo aCurrentInfo;
//Prepare the xml document and context
rtl::OString sSettingsPath = jfw::getVendorSettingsPath();
jfw::CXmlDocPtr doc = xmlParseFile(sSettingsPath.getStr());
jfw::CXmlDocPtr doc(xmlParseFile(sSettingsPath.getStr()));
if (doc == NULL)
{
OSL_ASSERT(0);
return JFW_E_ERROR;
}
jfw::CXPathContextPtr context = xmlXPathNewContext(doc);
jfw::CXPathContextPtr context(xmlXPathNewContext(doc));
int reg = xmlXPathRegisterNs(context, (xmlChar*) "jf",
(xmlChar*) NS_JAVA_FRAMEWORK);
if (reg == -1)
......@@ -662,7 +668,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo)
errcode = aSettings.loadFromSettings();
if (errcode == JFW_E_NONE)
{
jfw::CJavaInfo aInfo = aSettings.getJavaInfo();
jfw::CJavaInfo aInfo(aSettings.getJavaInfo());
if (aInfo == NULL)
return JFW_E_NO_SELECT;
//If the javavendors.xml has changed, then the current selected
......@@ -700,13 +706,13 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
javaFrameworkError errcode = JFW_E_NONE;
//Prepare the xml document and context
rtl::OString sSettingsPath = jfw::getVendorSettingsPath();
jfw::CXmlDocPtr doc = xmlParseFile(sSettingsPath.getStr());
jfw::CXmlDocPtr doc(xmlParseFile(sSettingsPath.getStr()));
if (doc == NULL)
{
OSL_ASSERT(0);
return JFW_E_ERROR;
}
jfw::CXPathContextPtr context = xmlXPathNewContext(doc);
jfw::CXPathContextPtr context(xmlXPathNewContext(doc));
int reg = xmlXPathRegisterNs(context, (xmlChar*) "jf",
(xmlChar*) NS_JAVA_FRAMEWORK);
if (reg == -1)
......@@ -969,7 +975,7 @@ JavaInfo * CJavaInfo::copyJavaInfo(const JavaInfo * pInfo)
if (pInfo == NULL)
return NULL;
JavaInfo* newInfo =
(JavaInfo*) rtl_allocateMemory(sizeof JavaInfo);
(JavaInfo*) rtl_allocateMemory(sizeof(JavaInfo));
if (newInfo)
{
rtl_copyMemory(newInfo, pInfo, sizeof(JavaInfo));
......
jvmfwk/source/fwkutil.cxx
Dosyayı görüntüle @ c6ee6abe
......@@ -2,9 +2,9 @@
*
* $RCSfile: fwkutil.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: jl $ $Date: 2004-04-26 15:52:15 $
* last change: $Author: jl $ $Date: 2004-04-27 15:22:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -73,7 +73,7 @@
#include "rtl/uri.hxx"
#include "rtl/process.h"
#include "osl/getglobalmutex.hxx"
#include "libxml/xpathinternals.h"
#include "libxml/xpathInternals.h"
#include "framework.hxx"
#include "elements.hxx"
......@@ -223,7 +223,7 @@ javaFrameworkError getPluginLibrary(rtl::OUString & sLibUrl)
if ((errcode = javaNode.loadFromSettings()) != JFW_E_NONE)
return errcode;
CJavaInfo aInfo = javaNode.getJavaInfo();
CJavaInfo aInfo(javaNode.getJavaInfo());
if (aInfo == NULL)
return JFW_E_NO_SELECT;
......@@ -248,11 +248,13 @@ javaFrameworkError getPluginLibrary(rtl::OUString & sLibUrl)
rtl::OUString ouExpr = usBuffer.makeStringAndClear();
rtl::OString sExpression =
rtl::OUStringToOString(ouExpr, osl_getThreadTextEncoding());
CXPathObjectPtr pathObjVendor = xmlXPathEvalExpression(
CXPathObjectPtr pathObjVendor;
pathObjVendor = xmlXPathEvalExpression(
(xmlChar*) sExpression.getStr(), contextVendor);
if (xmlXPathNodeSetIsEmpty(pathObjVendor->nodesetval))
return JFW_E_FORMAT_STORE;
CXmlCharPtr xmlCharPlugin =
CXmlCharPtr xmlCharPlugin;
xmlCharPlugin =
xmlNodeListGetString(
docVendor,pathObjVendor->nodesetval->nodeTab[0], 1);
......@@ -273,7 +275,8 @@ javaFrameworkError getVendorPluginURLs(
OSL_ASSERT(vecPlugins && doc && context);
//get the nodeset for the library elements
jfw::CXPathObjectPtr result = xmlXPathEvalExpression(
jfw::CXPathObjectPtr result;
result = xmlXPathEvalExpression(
(xmlChar*)"/jf:javaSelection/jf:plugins/jf:library", context);
if (xmlXPathNodeSetIsEmpty(result->nodesetval))
{
......@@ -288,10 +291,9 @@ javaFrameworkError getVendorPluginURLs(
//between library elements are also text elements
if (cur->type == XML_ELEMENT_NODE)
{
jfw::CXmlCharPtr sAttrVendor =
xmlGetProp(cur, (xmlChar*) "vendor");
jfw::CXmlCharPtr sTextLibrary =
xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
jfw::CXmlCharPtr sAttrVendor(xmlGetProp(cur, (xmlChar*) "vendor"));
jfw::CXmlCharPtr sTextLibrary(
xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
PluginLibrary plugin;
plugin.sVendor = rtl::OString((sal_Char*)(xmlChar*) sAttrVendor);
//create the file URL to the library
......@@ -485,7 +487,8 @@ javaFrameworkError getVersionInformation(
"/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
sVendor + rtl::OString("\"]/jf:minVersion");
jfw::CXPathObjectPtr xPathObjectMin =
jfw::CXPathObjectPtr xPathObjectMin;
xPathObjectMin =
xmlXPathEvalExpression((xmlChar*) sExpresion.getStr(), context);
if (xmlXPathNodeSetIsEmpty(xPathObjectMin->nodesetval))
{
......@@ -493,8 +496,9 @@ javaFrameworkError getVersionInformation(
}
else
{
jfw::CXmlCharPtr sVersion = xmlNodeListGetString(doc,
xPathObjectMin->nodesetval->nodeTab[0]->xmlChildrenNode, 1);
jfw::CXmlCharPtr sVersion;
sVersion = xmlNodeListGetString(
doc, xPathObjectMin->nodesetval->nodeTab[0]->xmlChildrenNode, 1);
rtl::OString osVersion((sal_Char*)(xmlChar*) sVersion);
pVersionInfo->sMinVersion = rtl::OStringToOUString(
osVersion, RTL_TEXTENCODING_UTF8);
......@@ -503,16 +507,18 @@ javaFrameworkError getVersionInformation(
//Get maxVersion
sExpresion = rtl::OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
sVendor + rtl::OString("\"]/jf:maxVersion");
jfw::CXPathObjectPtr xPathObjectMax =
xmlXPathEvalExpression((xmlChar*) sExpresion.getStr(), context);
jfw::CXPathObjectPtr xPathObjectMax;
xPathObjectMax = xmlXPathEvalExpression(
(xmlChar*) sExpresion.getStr(), context);
if (xmlXPathNodeSetIsEmpty(xPathObjectMax->nodesetval))
{
pVersionInfo->sMaxVersion = rtl::OUString();
}
else
{
jfw::CXmlCharPtr sVersion = xmlNodeListGetString(doc,
xPathObjectMax->nodesetval->nodeTab[0]->xmlChildrenNode, 1);
jfw::CXmlCharPtr sVersion;
sVersion = xmlNodeListGetString(
doc,xPathObjectMax->nodesetval->nodeTab[0]->xmlChildrenNode, 1);
rtl::OString osVersion((sal_Char*) (xmlChar*) sVersion);
pVersionInfo->sMaxVersion = rtl::OStringToOUString(
osVersion, RTL_TEXTENCODING_UTF8);
......@@ -521,9 +527,9 @@ javaFrameworkError getVersionInformation(
//Get excludeVersions
sExpresion = rtl::OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
sVendor + rtl::OString("\"]/jf:excludeVersions/jf:version");
jfw::CXPathObjectPtr xPathObjectVersions =
xmlXPathEvalExpression((xmlChar*) sExpresion.getStr(),
context);
jfw::CXPathObjectPtr xPathObjectVersions;
xPathObjectVersions =
xmlXPathEvalExpression((xmlChar*) sExpresion.getStr(), context);
xmlNode* cur = xPathObjectVersions->nodesetval->nodeTab[0];
while (cur != NULL)
{
......@@ -531,8 +537,8 @@ javaFrameworkError getVersionInformation(
{
if (xmlStrcmp(cur->name, (xmlChar*) "version") == 0)
{
jfw::CXmlCharPtr sVersion = xmlNodeListGetString(doc,
cur->xmlChildrenNode, 1);
jfw::CXmlCharPtr sVersion;
sVersion = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
rtl::OString osVersion((sal_Char*)(xmlChar*) sVersion);
rtl::OUString usVersion = rtl::OStringToOUString(
osVersion, RTL_TEXTENCODING_UTF8);
......@@ -601,11 +607,11 @@ rtl::ByteSequence decodeBase16(const rtl::ByteSequence& data)
pData++;
curChar = *pData;
//find the index for the next 4bits
for (int ii = 0; ii < 16; ii++)
for (int j = 0; j < 16; j++)
{
if (curChar == decodingTable[ii])
if (curChar == decodingTable[j])
{
nibble |= ii;
nibble |= j;
break;
}
}
......
jvmfwk/source/libxmlutil.cxx
Dosyayı görüntüle @ c6ee6abe
......@@ -2,9 +2,9 @@
*
* $RCSfile: libxmlutil.cxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: jl $ $Date: 2004-04-19 15:55:25 $
* last change: $Author: jl $ $Date: 2004-04-27 15:22:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -95,7 +95,7 @@ CXPathObjectPtr::operator xmlXPathObject*()
return _object;
}
//===========================================================
CXPathContextPtr::CXPathContextPtr(xmlXPathContext* aContext)
CXPathContextPtr::CXPathContextPtr(xmlXPathContextPtr aContext)
: _object(aContext)
{
}
......@@ -109,7 +109,7 @@ CXPathContextPtr::~CXPathContextPtr()
xmlXPathFreeContext(_object);
}
CXPathContextPtr & CXPathContextPtr::operator = (xmlXPathContext* pObj)
CXPathContextPtr & CXPathContextPtr::operator = (xmlXPathContextPtr pObj)
{
if (_object == pObj)
return *this;
......@@ -193,7 +193,7 @@ CXmlDocPtr::operator xmlDoc*()
// }
//===========================================================
CXmlCharPtr::CXmlCharPtr(xmlChar* aChar)
CXmlCharPtr::CXmlCharPtr(xmlChar * aChar)
: _object(aChar)
{
}
......@@ -215,10 +215,10 @@ CXmlCharPtr & CXmlCharPtr::operator = (xmlChar* pObj)
_object = pObj;
return *this;
}
xmlChar* CXmlCharPtr::operator ->()
{
return _object;
}
// xmlChar* CXmlCharPtr::operator ->()
// {
// return _object;
// }
CXmlCharPtr::operator xmlChar*()
{
......
jvmfwk/source/libxmlutil.hxx
Dosyayı görüntüle @ c6ee6abe
......@@ -2,9 +2,9 @@
*
* $RCSfile: libxmlutil.hxx,v $
*
* $Revision: 1.1 $
* $Revision: 1.2 $
*
* last change: $Author: jl $ $Date: 2004-04-19 15:56:06 $
* last change: $Author: jl $ $Date: 2004-04-27 15:22:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -91,12 +91,12 @@ class CXPathContextPtr
{
xmlXPathContext* _object;
CXPathContextPtr(const CXPathContextPtr&);
CXPathContextPtr(const jfw::CXPathContextPtr&);
CXPathContextPtr & operator = (const CXPathContextPtr&);
public:
CXPathContextPtr();
CXPathContextPtr(xmlXPathContext* aContext);
CXPathContextPtr & operator = (xmlXPathContext* pObj);
CXPathContextPtr(xmlXPathContextPtr aContext);
CXPathContextPtr & operator = (xmlXPathContextPtr pObj);
~CXPathContextPtr();
xmlXPathContext* operator -> ();
operator xmlXPathContext* ();
......@@ -150,7 +150,7 @@ public:
CXmlCharPtr(xmlChar* aDoc);
~CXmlCharPtr();
CXmlCharPtr & operator = (xmlChar* pObj);
xmlChar* operator -> ();
// xmlChar* operator -> ();
operator xmlChar* ();
operator rtl::OUString ();
operator rtl::OString ();
......
jvmfwk/source/makefile.mk
Dosyayı görüntüle @ c6ee6abe
......@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.3 $
# $Revision: 1.4 $
#
# last change: $Author: jl $ $Date: 2004-04-20 10:01:50 $
# last change: $Author: jl $ $Date: 2004-04-27 15:22:15 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
......@@ -97,7 +97,8 @@ SHL1TARGET = $(FRAMEWORKLIB)
SHL1DEPN=
SHL1IMPLIB = i$(FRAMEWORKLIB)
SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) ixml2.lib
SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) $(XML2LIB)
SHL1VERSIONMAP = framework.map
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME = $(SHL1TARGET)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment