Menu
▾
▴
sblim-commit — CVS Commit Info for SBLIM
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(1) |
Mar
(45) |
Apr
(150) |
May
(145) |
Jun
(150) |
Jul
(79) |
Aug
(313) |
Sep
(160) |
Oct
(309) |
Nov
(115) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(160) |
Feb
(144) |
Mar
(127) |
Apr
(48) |
May
(102) |
Jun
(54) |
Jul
(245) |
Aug
(94) |
Sep
(152) |
Oct
(162) |
Nov
(166) |
Dec
(740) |
| 2007 |
Jan
(752) |
Feb
(437) |
Mar
(328) |
Apr
(373) |
May
(569) |
Jun
(399) |
Jul
(369) |
Aug
(627) |
Sep
(100) |
Oct
(306) |
Nov
(166) |
Dec
(282) |
| 2008 |
Jan
(68) |
Feb
(145) |
Mar
(180) |
Apr
(160) |
May
(277) |
Jun
(229) |
Jul
(1188) |
Aug
(51) |
Sep
(97) |
Oct
(99) |
Nov
(95) |
Dec
(170) |
| 2009 |
Jan
(39) |
Feb
(73) |
Mar
(120) |
Apr
(121) |
May
(104) |
Jun
(262) |
Jul
(57) |
Aug
(171) |
Sep
(131) |
Oct
(88) |
Nov
(64) |
Dec
(83) |
| 2010 |
Jan
(55) |
Feb
(67) |
Mar
(124) |
Apr
(64) |
May
(130) |
Jun
(75) |
Jul
(164) |
Aug
(64) |
Sep
(44) |
Oct
(17) |
Nov
(43) |
Dec
(31) |
| 2011 |
Jan
(21) |
Feb
(10) |
Mar
(43) |
Apr
(46) |
May
(52) |
Jun
(71) |
Jul
(7) |
Aug
(16) |
Sep
(51) |
Oct
(14) |
Nov
(33) |
Dec
(15) |
| 2012 |
Jan
(12) |
Feb
(61) |
Mar
(129) |
Apr
(76) |
May
(70) |
Jun
(52) |
Jul
(29) |
Aug
(41) |
Sep
(32) |
Oct
(23) |
Nov
(38) |
Dec
(26) |
| 2013 |
Jan
(35) |
Feb
(37) |
Mar
(51) |
Apr
(15) |
May
(52) |
Jun
(15) |
Jul
(23) |
Aug
(21) |
Sep
(46) |
Oct
(69) |
Nov
(57) |
Dec
(26) |
| 2014 |
Jan
(5) |
Feb
(13) |
Mar
(17) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
(8) |
Dec
(4) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Gareth S B. <bes...@us...> - 2005-05-27 22:52:07
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17516 Modified Files: installsfcb.sh Log Message: ifix for http://sourceforge.net/tracker/index.php?func=detail&aid=1209973&group_id=128809&atid=712784 Index: installsfcb.sh =================================================================== RCS file: /cvsroot/sblim/sfcb/installsfcb.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- installsfcb.sh 26 May 2005 20:24:39 -0000 1.5 +++ installsfcb.sh 27 May 2005 22:51:56 -0000 1.6 @@ -267,7 +267,7 @@ echo "-------------------------------------------------------------------------------" echo -n "Do you want to install the SBLIM test CMPI providers? [Y]/n "; read _ANSWER if [[ -z $_ANSWER || $_ANSWER = "Y" || $_ANSWER = "y" ]]; then - _PACKAGES="cmpi-instancetest cmpi-methodtest cmpi-processindicationtest cmpi-reef" + _PACKAGES="cmpi-instancetest cmpi-methodtest cmpi-processindicationtest cmpi-lifecycleindicationtest cmpi-reef" for _PACKAGE in $_PACKAGES; do cd $_SRCROOT/sblim _installpkg cmpi-tests/$_PACKAGE $_PREFIX |
|
From: Gareth S B. <bes...@us...> - 2005-05-27 22:50:18
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17253 Modified Files: Makefile.am Log Message: fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1210083&group_id=128809&atid=712784 Index: Makefile.am =================================================================== RCS file: /cvsroot/sblim/sfcb/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Makefile.am 18 May 2005 15:02:16 -0000 1.20 +++ Makefile.am 27 May 2005 22:49:54 -0000 1.21 @@ -155,7 +155,7 @@ nodist_bin_SCRIPTS=sfcbrepos sfcbstage sfcbunstage -dist_bin_SCRIPTS=wbemcat +dist_bin_SCRIPTS=wbemcat xmltest.sh init_SCRIPTS=sfcb |
|
From: Gareth S B. <bes...@us...> - 2005-05-27 22:48:11
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15873 Added Files: xmltest.sh Log Message: fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1210083&group_id=128809&atid=712784 --- NEW FILE: xmltest.sh --- #!/bin/sh _RC=0 # Check for wbemcat utility if ! which wbemcat > /dev/null; then echo "Cannot find wbemcat. Please check your PATH" exit 1 fi # ------------------------------------------------------------------------------ function _runxmltest { typeset _TESTXML=$1 _TEST=${_TESTXML%.xml} _TESTDIR=$( dirname $_TEST) _TESTOK=$_TEST.OK _TESTRESULT=$_TEST.result echo -n "Running test $_TESTXML ... " # Make sure we will be able to write the result file if [[ ! -w $_TESTDIR ]]; then echo "FAILED"; echo -e "\tCannot write to $_TESTDIR" continue fi # Remove any old test result file rm -f $_TESTRESULT # Send the test CIM-XML to the CIMOM and save the response, stripping off the http header wbemcat $_TESTXML | awk "{i++; if (i>7) print}" > $_TESTRESULT if [[ $? -ne 0 ]]; then echo "FAILED"; echo -e "\twbemcat failed to send CIM-XML request" _RC=1 continue fi # If we dont yet have the expected result file, then save this response as the (new) expected result if [[ ! -f $_TESTOK ]]; then echo "OK"; echo -e "\tSaving response as $_TESTOK" mv $_TESTRESULT $_TESTOK # Compare the response XML against the expected XML for differences elif ! diff --brief $_TESTOK $_TESTRESULT > /dev/null; then echo "FAILED"; echo -e "\tCheck $_TESTRESULT for errors" _RC=1; continue # We got the expected response XML else echo "Passed" rm -f $_TESTRESULT fi } # ------------------------------------------------------------------------------ if [[ -n $1 ]]; then _runxmltest $1 else # Look for all *.xml test files and run them in sorted order (hence tests should be numbered) find -name "*.xml" | sort | while read _TESTXML; do _runxmltest $_TESTXML # Wait for the dust to settle before trying the next test... sleep 1 done fi exit $_RC |
|
From: Gareth S B. <bes...@us...> - 2005-05-27 18:51:09
|
Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26295 Removed Files: runtest Log Message: --- runtest DELETED --- |
|
From: Adrian S. <a3s...@us...> - 2005-05-27 15:09:22
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11579 Modified Files: objectImpl.c Log Message: Fixed [ 1191278 ] wbemcli segv's on ec Incorrect handling of CMPIstrings in addObjectPropertyH() Index: objectImpl.c =================================================================== RCS file: /cvsroot/sblim/sfcb/objectImpl.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- objectImpl.c 5 May 2005 22:12:34 -0000 1.5 +++ objectImpl.c 27 May 2005 15:09:13 -0000 1.6 @@ -1245,6 +1245,13 @@ p->data = d; p->data.value.chars = (char *) addClString(hdr, d.value.chars); } + else if (d.type == CMPI_string && (d.state & CMPI_nullValue) == 0) { + p->data = d; + if (d.value.string) + p->data.value.chars = (char*)addClString(hdr, (char*)d.value.string->hdl); + else p->data.value.chars=NULL; + p->data.type=CMPI_chars; + } else if (d.type == CMPI_dateTime && (d.state & CMPI_nullValue) == 0) { char chars[26]; dateTime2chars(d.value.dateTime, NULL, chars); |
|
From: Adrian S. <a3s...@us...> - 2005-05-27 14:29:27
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1509 Modified Files: classProvider.c Log Message: Fixed [ 1209907 ] Incorrect CMPI_RC_ERR_CLASS_HAS_CHILDREN error Index: classProvider.c =================================================================== RCS file: /cvsroot/sblim/sfcb/classProvider.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- classProvider.c 22 May 2005 18:45:03 -0000 1.13 +++ classProvider.c 27 May 2005 14:29:02 -0000 1.14 @@ -843,7 +843,10 @@ } UtilList *ul = getChildren(cReg,cn); - if (ul) { + if (ul && ul->ft->size(ul)) { +// char *child; +// for (child =(char*)ul->ft->getFirst(ul); child; child=(char*)ul->ft->getNext(ul)) +// printf("child: %s\n",child); st.rc = CMPI_RC_ERR_CLASS_HAS_CHILDREN; _SFCB_RETURN(st); } |
|
From: Gareth S B. <bes...@us...> - 2005-05-26 20:26:29
|
Update of /cvsroot/sblim/cmpi-samples/cmpi-instancelist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18588 Modified Files: CWS_InstanceList.c Log Message: fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1203799&group_id=128809&atid=712784 Index: CWS_InstanceList.c =================================================================== RCS file: /cvsroot/sblim/cmpi-samples/cmpi-instancelist/src/CWS_InstanceList.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- CWS_InstanceList.c 3 May 2005 19:43:44 -0000 1.1.1.1 +++ CWS_InstanceList.c 26 May 2005 20:26:19 -0000 1.2 @@ -533,6 +533,7 @@ /* Initialize an empty NULL terminated instances list */ instances = (CMPIInstance **)malloc(sizeof(CMPIInstance *)); instances[0] = NULL; + sizeinstances = 1; /* Create sample instance(s) and add to the list of instances */ while (instancenum > 0) { |
|
From: Gareth S B. <bes...@us...> - 2005-05-26 20:24:47
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18215 Modified Files: installsfcb.sh Log Message: http://sourceforge.net/tracker/index.php?func=detail&aid=1209426&group_id=128809&atid=712784 Index: installsfcb.sh =================================================================== RCS file: /cvsroot/sblim/sfcb/installsfcb.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- installsfcb.sh 19 May 2005 23:20:52 -0000 1.4 +++ installsfcb.sh 26 May 2005 20:24:39 -0000 1.5 @@ -267,8 +267,7 @@ echo "-------------------------------------------------------------------------------" echo -n "Do you want to install the SBLIM test CMPI providers? [Y]/n "; read _ANSWER if [[ -z $_ANSWER || $_ANSWER = "Y" || $_ANSWER = "y" ]]; then -# _PACKAGES="cmpi-instancetest cmpi-associationtest cmpi-methodtest cmpi-indicationtest cmpi-reef" - _PACKAGES="cmpi-instancetest cmpi-methodtest cmpi-reef" + _PACKAGES="cmpi-instancetest cmpi-methodtest cmpi-processindicationtest cmpi-reef" for _PACKAGE in $_PACKAGES; do cd $_SRCROOT/sblim _installpkg cmpi-tests/$_PACKAGE $_PREFIX |
|
From: Gareth S B. <bes...@us...> - 2005-05-26 20:21:22
|
Update of /cvsroot/sblim/sfcb/regressionTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17402 Modified Files: build.sh Log Message: removed support for ProcessIndication http://sourceforge.net/tracker/index.php?func=detail&aid=1209426&group_id=128809&atid=712784 Index: build.sh =================================================================== RCS file: /cvsroot/sblim/sfcb/regressionTests/build.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- build.sh 18 May 2005 21:30:02 -0000 1.9 +++ build.sh 26 May 2005 20:21:13 -0000 1.10 @@ -19,7 +19,7 @@ # */ -dirs='ProcessIndications LifeCycleIndications' +dirs='LifeCycleIndications' sfcbdir=/usr/local/share/sfcb if [ -x /usr/bin/curl ] && [ ! -f $sfcbdir/CIM/CIM_Schema.mof ] |
|
From: Gareth S B. <bes...@us...> - 2005-05-26 20:18:11
|
Update of /cvsroot/sblim/sfcb/regressionTests/ProcessIndications/schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13997/schema Removed Files: indications.mof indications.reg Log Message: ProcessIndication deprecated by cmpi-tests/cmpi-processindicationtest provider --- indications.mof DELETED --- --- indications.reg DELETED --- |
|
From: Gareth S B. <bes...@us...> - 2005-05-26 20:18:11
|
Update of /cvsroot/sblim/sfcb/regressionTests/ProcessIndications/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13997/tests Removed Files: CreateDeleteSeq01.sh CreateFilter01.OK CreateFilter01.xml CreateHandler01.OK CreateHandler01.xml CreateSubscription01.OK CreateSubscription01.xml DeleteFilter01.OK DeleteFilter01.xml DeleteHandler01.OK DeleteHandler01.xml DeleteSubscription01.OK DeleteSubscription01.xml Log Message: ProcessIndication deprecated by cmpi-tests/cmpi-processindicationtest provider --- CreateFilter01.xml DELETED --- --- DeleteHandler01.xml DELETED --- --- CreateHandler01.xml DELETED --- --- DeleteHandler01.OK DELETED --- --- DeleteSubscription01.OK DELETED --- --- DeleteFilter01.xml DELETED --- --- CreateDeleteSeq01.sh DELETED --- --- DeleteSubscription01.xml DELETED --- --- DeleteFilter01.OK DELETED --- --- CreateFilter01.OK DELETED --- --- CreateHandler01.OK DELETED --- --- CreateSubscription01.OK DELETED --- --- CreateSubscription01.xml DELETED --- |
|
From: Gareth S B. <bes...@us...> - 2005-05-26 20:18:09
|
Update of /cvsroot/sblim/sfcb/regressionTests/ProcessIndications In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13997 Removed Files: Makefile env indTestProvider.c rules wbemcli.ind Log Message: ProcessIndication deprecated by cmpi-tests/cmpi-processindicationtest provider --- rules DELETED --- --- indTestProvider.c DELETED --- --- wbemcli.ind DELETED --- --- Makefile DELETED --- --- env DELETED --- |
|
From: Gareth S B. <bes...@us...> - 2005-05-26 20:09:18
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11898 Modified Files: default.reg Log Message: fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1209426&group_id=128809&atid=712784 Index: default.reg =================================================================== RCS file: /cvsroot/sblim/sfcb/default.reg,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- default.reg 22 May 2005 18:45:03 -0000 1.5 +++ default.reg 26 May 2005 20:09:09 -0000 1.6 @@ -16,16 +16,6 @@ type: instance association method unload: never # -[CIM_IndicationFilter] - provider: InteropProvider - location: sfcInteropProvider - type: instance association method -# -[CIM_IndicationSubscription] - provider: InteropProvider - location: sfcInteropProvider - type: instance association method -# [CIM_ListenerDestinationCIMXML] provider: IndCIMXMLHandler location: sfcIndCIMXMLHandler |
|
From: Gareth S B. <bes...@us...> - 2005-05-26 14:59:05
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4483 Modified Files: trace.h Log Message: fix bug in _SFCB_TRACE_STOP() macro Index: trace.h =================================================================== RCS file: /cvsroot/sblim/sfcb/trace.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- trace.h 26 Apr 2005 21:58:47 -0000 1.3 +++ trace.h 26 May 2005 14:58:55 -0000 1.4 @@ -50,7 +50,7 @@ _sfcb_trace_start(n); #define _SFCB_TRACE_STOP() \ - _sfcb_trace_stop(n); + _sfcb_trace_stop(); #define _SFCB_TRACE_FUNCTION(LEVEL,f) \ _SFCB_TRACE(LEVEL,("Invoking trace function %s",#f)); \ |
|
From: Benjamin B. <bg...@us...> - 2005-05-25 15:45:57
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5770/Plugin/com/ibm/ecute/rsa/core/internal/dialogs Modified Files: EditQualifiersDialog.java Log Message: 2.1 beta 1a changes in flavor and scope representation changes of edit value and remove value behavior -> apply, undo Index: EditQualifiersDialog.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs/EditQualifiersDialog.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- EditQualifiersDialog.java 23 May 2005 07:16:30 -0000 1.3 +++ EditQualifiersDialog.java 25 May 2005 15:45:48 -0000 1.4 @@ -96,8 +96,10 @@ private static final int BUTTON_WIDTH = 90; private static final int BUTTON_HEIGHT = 22; - private static final int NAME_COL_WIDTH = 135; - private static final int TYPE_COL_WIDTH = 60; + private static final int NAME_COL_WIDTH = 135; + private static final int TYPE_COL_WIDTH = 60; + private static final int INHERIT_COL_WIDTH = 160; + private static final int TRANS_COL_WIDTH = 75; private Color RED = null; [...1178 lines suppressed...] if(nullButton.getSelection() == true){ @@ -3183,6 +3474,17 @@ textField.setFocus(); textField.setSelection(0); } else { + if(valueObject.datatype.equalsIgnoreCase("boolean")){ + if(nullButton.getSelection()){ + booleanValue = "null"; + } else { + if(trueButton.getSelection()){ + booleanValue = "true"; + } else if(falseButton.getSelection()){ + booleanValue = "false"; + } + } + } this.close(); } } |
|
From: Benjamin B. <bg...@us...> - 2005-05-25 15:45:57
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5770/Plugin/com/ibm/ecute/rsa/core/internal/properties Modified Files: QualifiersPropertySection.java Log Message: 2.1 beta 1a changes in flavor and scope representation changes of edit value and remove value behavior -> apply, undo Index: QualifiersPropertySection.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties/QualifiersPropertySection.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- QualifiersPropertySection.java 23 May 2005 07:16:30 -0000 1.14 +++ QualifiersPropertySection.java 25 May 2005 15:45:48 -0000 1.15 @@ -88,8 +88,8 @@ private TableColumn valueColumn; private TableColumn definedInColumn; private TableColumn typeColumn; - private TableColumn scopeColumn; - private TableColumn flavorColumn; + private TableColumn inheritanceColumn; + private TableColumn translatableColumn; private Table qualifiersTable; private ArrayList defaultValueQualifiers; @@ -152,10 +152,10 @@ typeColumn.setText("Type"); definedInColumn = new TableColumn(qualifiersTable, 0); definedInColumn.setText("Defined in"); - flavorColumn = new TableColumn(qualifiersTable, 0); - flavorColumn.setText("Flavor"); - //scopeColumn = new TableColumn(qualifiersTable, 0); - //scopeColumn.setText("Scope"); + inheritanceColumn = new TableColumn(qualifiersTable, 0); + inheritanceColumn.setText("Inheritance Behavior"); + translatableColumn = new TableColumn(qualifiersTable, SWT.CENTER); + translatableColumn.setText("Translatable"); qualifiersTable.addMouseListener(new MouseAdapter() { public void mouseDoubleClick(MouseEvent e){ @@ -176,7 +176,7 @@ formdata.height = 800; qualifiersTable.setLayoutData(formdata); - editValueButton.setEnabled(true); + //editValueButton.setEnabled(true); } @@ -189,7 +189,7 @@ qualifiersTable.removeAll(); defaultValueQualifiers.clear(); - editValueButton.setEnabled(true); + //editValueButton.setEnabled(true); if(!(getEObject() instanceof NamedElement)) { packColumns(); @@ -749,27 +749,25 @@ definedIn = ""; //String scope = ""; - String flavor = ""; + String inheritance = ""; + String translatable = ""; String defaultValue = "null"; if(qualifier != null){ if(qualifier.type2String()!=null) type = qualifier.type2String(); -// if(qualifier.scope2String()!=null){ -// scope = qualifier.scope2String(); -// scope = scope.replaceAll(" ",", "); -// } if(qualifier.rsaFlavor2String()!= null){ - //flavor = qualifier.flavor2String(); - //flavor = flavor.replaceAll(" ", ", "); - flavor = qualifier.rsaFlavor2String(); + inheritance = qualifier.rsaFlavor2String(); } if(qualifier.defaultValue!=null){ defaultValue = qualifier.defaultValue; } + if(qualifier.TranslatableFlavor){ + translatable = "X"; + } } - String as[] = {name, qualifierValue, type, definedIn, flavor/*, scope*/}; + String as[] = {name, qualifierValue, type, definedIn, inheritance, translatable}; tableitem.setText(as); tableitem.setData(new QualifierValueObject(name, qualifierValue, defaultValue, index)); @@ -824,30 +822,16 @@ return list; } -// protected void displayError(String s, String s1) -// { -// Status status = new Status(4, ModelerUIPropertiesPlugin.getPluginId(), 6, s1, null); -// ErrorDialog.openError(Display.getCurrent().getActiveShell(), s, null, status); -// } - private void packColumns() { nameColumn.pack(); valueColumn.setWidth(150); - //valueColumn.pack(); typeColumn.pack(); definedInColumn.pack(); - flavorColumn.pack(); - //scopeColumn.pack(); - //qualifiersTable.pack(); + inheritanceColumn.pack(); + translatableColumn.pack(); } -// public void addFilter() -// { -// com.ibm.xtools.emf.msl.internal.MFilter.Or or = new com.ibm.xtools.emf.msl.internal.MFilter.Or(EventListener.elementCreatedEventFilter, EventListener.elementDeletedEventFilter); -// getEventListener().setFilter(new com.ibm.xtools.emf.msl.internal.MFilter.Or(or, EventListener.elementModifiedEventFilter)); -// } - public void handleElementCreatedEvent(Notification notification, EObject eobject, EObject eobject1) { update(notification, eobject); @@ -1250,9 +1234,4 @@ } } - -// public void dispose() { -// super.dispose(); -// boldFont.dispose(); -// } } |
|
From: Benjamin B. <bg...@us...> - 2005-05-25 15:45:56
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Qualifiers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5770/Plugin/com/ibm/ecute/Qualifiers Modified Files: Qualifier.java Log Message: 2.1 beta 1a changes in flavor and scope representation changes of edit value and remove value behavior -> apply, undo Index: Qualifier.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Qualifiers/Qualifier.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Qualifier.java 23 May 2005 07:16:29 -0000 1.5 +++ Qualifier.java 25 May 2005 15:45:48 -0000 1.6 @@ -169,8 +169,6 @@ flavor += " EnableOverride"; } } - if (TranslatableFlavor) - flavor += ", Translatable"; return flavor; } |
|
From: Benjamin B. <bg...@us...> - 2005-05-25 07:05:08
|
Update of /cvsroot/sblim/ecute/Docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26722/Docs Added Files: ECUTE-UML-Profile-for-CIM.doc Log Message: ECUTE-UML-Profile-for-CIM.doc added --- NEW FILE: ECUTE-UML-Profile-for-CIM.doc --- (This appears to be a binary file; contents omitted.) |
|
From: Gareth S B. <bes...@us...> - 2005-05-24 23:00:35
|
Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10238 Modified Files: TST_InstanceTest.c Log Message: Index: TST_InstanceTest.c =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src/TST_InstanceTest.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TST_InstanceTest.c 24 May 2005 20:54:28 -0000 1.5 +++ TST_InstanceTest.c 24 May 2005 23:00:23 -0000 1.6 @@ -1506,7 +1506,7 @@ /* Initialize an empty NULL terminated instances list */ instances = (CMPIInstance **)malloc(sizeof(CMPIInstance *)); instances[0] = NULL; - sizeinstances = 1 + sizeinstances = 1; /* Create sample instance(s) and add to the list of instances */ while (instancenum > 0) { |
|
From: Gareth S B. <bes...@us...> - 2005-05-24 20:54:37
|
Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17429 Modified Files: TST_InstanceTest.c Log Message: fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1203799&group_id=128809&atid=712784 Index: TST_InstanceTest.c =================================================================== RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src/TST_InstanceTest.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- TST_InstanceTest.c 18 May 2005 15:47:56 -0000 1.4 +++ TST_InstanceTest.c 24 May 2005 20:54:28 -0000 1.5 @@ -1506,6 +1506,7 @@ /* Initialize an empty NULL terminated instances list */ instances = (CMPIInstance **)malloc(sizeof(CMPIInstance *)); instances[0] = NULL; + sizeinstances = 1 /* Create sample instance(s) and add to the list of instances */ while (instancenum > 0) { |
|
From: Benjamin B. <bg...@us...> - 2005-05-23 07:16:42
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31503/Plugin/com/ibm/ecute/rsa/core/internal/properties Modified Files: QualifiersPropertySection.java Log Message: Changes of the representation of qualifier flavors. Index: QualifiersPropertySection.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties/QualifiersPropertySection.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- QualifiersPropertySection.java 19 May 2005 09:17:49 -0000 1.13 +++ QualifiersPropertySection.java 23 May 2005 07:16:30 -0000 1.14 @@ -154,8 +154,8 @@ definedInColumn.setText("Defined in"); flavorColumn = new TableColumn(qualifiersTable, 0); flavorColumn.setText("Flavor"); - scopeColumn = new TableColumn(qualifiersTable, 0); - scopeColumn.setText("Scope"); + //scopeColumn = new TableColumn(qualifiersTable, 0); + //scopeColumn.setText("Scope"); qualifiersTable.addMouseListener(new MouseAdapter() { public void mouseDoubleClick(MouseEvent e){ @@ -748,29 +748,28 @@ if(definedIn==null) definedIn = ""; - String scope = ""; + //String scope = ""; String flavor = ""; String defaultValue = "null"; if(qualifier != null){ if(qualifier.type2String()!=null) type = qualifier.type2String(); - if(qualifier.scope2String()!=null){ - scope = qualifier.scope2String(); - scope = scope.replaceAll(" ",", "); - } - if(qualifier.flavor2String()!= null){ - flavor = qualifier.flavor2String(); - flavor = flavor.replaceAll(" ", ", "); +// if(qualifier.scope2String()!=null){ +// scope = qualifier.scope2String(); +// scope = scope.replaceAll(" ",", "); +// } + if(qualifier.rsaFlavor2String()!= null){ + //flavor = qualifier.flavor2String(); + //flavor = flavor.replaceAll(" ", ", "); + flavor = qualifier.rsaFlavor2String(); } if(qualifier.defaultValue!=null){ defaultValue = qualifier.defaultValue; } } - String as[] = { - name, qualifierValue, type, definedIn, flavor, scope - }; + String as[] = {name, qualifierValue, type, definedIn, flavor/*, scope*/}; tableitem.setText(as); tableitem.setData(new QualifierValueObject(name, qualifierValue, defaultValue, index)); @@ -839,7 +838,7 @@ typeColumn.pack(); definedInColumn.pack(); flavorColumn.pack(); - scopeColumn.pack(); + //scopeColumn.pack(); //qualifiersTable.pack(); } |
|
From: Benjamin B. <bg...@us...> - 2005-05-23 07:16:42
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31503/Plugin/com/ibm/ecute/utils Modified Files: Constants.java Log Message: Changes of the representation of qualifier flavors. Index: Constants.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils/Constants.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Constants.java 12 May 2005 07:52:44 -0000 1.10 +++ Constants.java 23 May 2005 07:16:30 -0000 1.11 @@ -22,7 +22,7 @@ public class Constants { - public static final String pluginVersion="2.1 beta 1"; + public static final String pluginVersion="2.1 beta 1a"; public static final String toolName="ECUTE"; public static final String qualifiersFileName="QualifiersList.txt"; |
|
From: Benjamin B. <bg...@us...> - 2005-05-23 07:16:42
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31503/Plugin/com/ibm/ecute/rsa/core/internal/dialogs Modified Files: EditQualifiersDialog.java Log Message: Changes of the representation of qualifier flavors. Index: EditQualifiersDialog.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs/EditQualifiersDialog.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- EditQualifiersDialog.java 19 May 2005 09:17:49 -0000 1.2 +++ EditQualifiersDialog.java 23 May 2005 07:16:30 -0000 1.3 @@ -96,7 +96,7 @@ private static final int BUTTON_WIDTH = 90; private static final int BUTTON_HEIGHT = 22; - private static final int NAME_COL_WIDTH = 125; + private static final int NAME_COL_WIDTH = 135; private static final int TYPE_COL_WIDTH = 60; private Color RED = null; @@ -276,19 +276,16 @@ vName.setWidth(NAME_COL_WIDTH); TableColumn vValue = new TableColumn(valueTable,SWT.LEFT); vValue.setText("Value"); - vValue.setWidth(130); + vValue.setWidth(175); TableColumn vType = new TableColumn(valueTable,SWT.LEFT); vType.setText("Type"); vType.setWidth(TYPE_COL_WIDTH); TableColumn vDefinedIn = new TableColumn(valueTable,SWT.LEFT); vDefinedIn.setText("Defined in"); - vDefinedIn.setWidth(125); + vDefinedIn.setWidth(170); TableColumn vFlavor = new TableColumn(valueTable,SWT.LEFT); vFlavor.setText("Flavor"); - vFlavor.setWidth(105); - TableColumn vScope = new TableColumn(valueTable,SWT.LEFT); - vScope.setText("Scope"); - vScope.setWidth(190); + vFlavor.setWidth(195); valueTable.addMouseListener(new MouseAdapter() { public void mouseDoubleClick(MouseEvent e){ @@ -548,14 +545,10 @@ rColumn.setText("R"); rColumn.setWidth(30); rColumn.setAlignment(SWT.CENTER); - TableColumn overrideColumn = new TableColumn(definitionTable,SWT.LEFT); - overrideColumn.setText("Disable Override"); - overrideColumn.setWidth(95); - overrideColumn.setAlignment(SWT.CENTER); - TableColumn restrictedColumn = new TableColumn(definitionTable,SWT.LEFT); - restrictedColumn.setText("Restricted"); - restrictedColumn.setWidth(75); - restrictedColumn.setAlignment(SWT.CENTER); + TableColumn inheritanceColumn = new TableColumn(definitionTable,SWT.LEFT); + inheritanceColumn.setText("Inheritance Behavior"); + inheritanceColumn.setWidth(160); + inheritanceColumn.setAlignment(SWT.LEFT); TableColumn translatableColumn = new TableColumn(definitionTable,SWT.LEFT); translatableColumn.setText("Translatable"); translatableColumn.setWidth(75); @@ -701,6 +694,9 @@ ti.setBackground(WHITE); } + definitionTable.removeAll(); + fillDefinitionTable(); + resetNewQualifiers(); resetEditedQualifiers(); resetDeletedQualifiers(); @@ -1017,7 +1013,7 @@ Property oppositeProp = null; boolean isOwnedEnd = propertyIsOwnedEnd(prop); // get the property of the other association end - if (isOwnedEnd /*&& prop.getOwner() instanceof AssociationClass*/){ + if (isOwnedEnd){ AssociationClass parentClass = (AssociationClass)prop.getOwner(); List ends = parentClass.getOwnedEnds(); if ((Property)ends.get(0) == prop){ @@ -1062,7 +1058,7 @@ allAvailableQualifers.remove(qualifierObject); } //Qualifier: Max, Min - if(isOwnedEnd /*&& prop.getOwner() instanceof AssociationClass*/){ + if(isOwnedEnd){ if(((AssociationClass)prop.getOwner()).getOwnedEnds().contains(prop)){ if(prop.getUpper() != MultiplicityElement.UNLIMITED_UPPER_BOUND){ qualifierName = "Max"; @@ -1218,35 +1214,25 @@ if(definedIn==null) definedIn = ""; - - - - String scope = ""; + String flavor = ""; String defaultValue = "null"; if(qualifier != null){ if(qualifier.type2String()!=null) type = qualifier.type2String(); - if(qualifier.scope2String()!=null){ - scope = qualifier.scope2String(); - scope = scope.replaceAll(" ",", "); - } - if(qualifier.flavor2String()!= null){ - flavor = qualifier.flavor2String(); - flavor = flavor.replaceAll(" ", ", "); + if(qualifier.rsaFlavor2String()!= null){ + flavor = qualifier.rsaFlavor2String(); } if(qualifier.defaultValue!=null){ defaultValue = qualifier.defaultValue; } } - String as[] = { - name, qualifierValue, type, definedIn, flavor, scope - }; + String as[] = {name, qualifierValue, type, definedIn, flavor}; tableitem.setText(as); - tableitem.setData(new QualifierValueObject(name, qualifierValue, type, definedIn, flavor, scope, - defaultValue, index)); + tableitem.setData(new QualifierValueObject(name, qualifierValue, type, definedIn, flavor, + defaultValue, index)); return i; } @@ -1283,7 +1269,7 @@ { Qualifier qualifier = (Qualifier)iterator1.next(); addQualiferToDefinitionTable(qualifier.name, qualifier); - } + } } private Qualifier definitionObjectToQualifier(QualifierDefinitionObject definitionObject){ @@ -1300,8 +1286,17 @@ qualifier.methodScope = definitionObject.methodScope; qualifier.parameterScope = definitionObject.parameterScope; qualifier.referenceScope = definitionObject.referenceScope; - qualifier.DissableOverrideFlavor = definitionObject.disableOverrideFlavor; - qualifier.RestrictedFlavor = definitionObject.restrictedFlavor; + if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("Restricted")){ + qualifier.DissableOverrideFlavor = false; + qualifier.RestrictedFlavor = true; + } else if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("ToSubclass DisableOverride")){ + qualifier.DissableOverrideFlavor = true; + qualifier.RestrictedFlavor = false; + } else if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("ToSubclass EnableOverride")){ + qualifier.DissableOverrideFlavor = false; + qualifier.RestrictedFlavor = false; + } + qualifier.TranslatableFlavor = definitionObject.translatableFlavor; return qualifier; @@ -1355,8 +1350,7 @@ String methodS = ""; String parameterS = ""; String referenceS = ""; - String disableOverrideF = ""; - String restrictedF = ""; + String inheritanceBehavior; String translatableF = ""; if (qualifier.classScope){ @@ -1387,28 +1381,30 @@ referenceS = "X"; referenceScope = true; } - if (qualifier.DissableOverrideFlavor){ - disableOverrideF = "X"; - disableOverrideFlavor = true; - } if (qualifier.RestrictedFlavor){ - restrictedF = "X"; - restrictedFlavor = true; + inheritanceBehavior = "Restricted"; + } else { + inheritanceBehavior = "ToSubclass"; + if (qualifier.DissableOverrideFlavor){ + inheritanceBehavior += " DisableOverride"; + } else { + inheritanceBehavior += " EnableOverride"; + } } + if (qualifier.TranslatableFlavor){ translatableF = "X"; translatableFlavor = true; } String as[] = {name, type, defaultValue, classS, associationS, indicationS, - propertyS, methodS, parameterS, referenceS, disableOverrideF, - restrictedF, translatableF}; + propertyS, methodS, parameterS, referenceS, inheritanceBehavior, + translatableF}; tableitem.setText(as); tableitem.setData( - new QualifierDefinitionObject(name, type, defaultValue, - classScope, associationScope, indicationScope, - propertyScope, methodScope, parameterScope, referenceScope, - disableOverrideFlavor, restrictedFlavor, translatableFlavor) + new QualifierDefinitionObject(name, type, defaultValue, classScope, + associationScope, indicationScope, propertyScope, methodScope, + parameterScope, referenceScope, inheritanceBehavior, translatableFlavor) ); return i; @@ -1436,7 +1432,6 @@ TableItem tableitem = null; if(!addAction){ tableitem = definitionTable.getItem(index); - //definitionTable.getItem(index).dispose(); definitionTable.remove(index); tableitem = new TableItem(definitionTable, 0, index); @@ -1454,12 +1449,12 @@ boolean methodScope = false; boolean parameterScope = false; boolean referenceScope = false; - boolean disableOverrideFlavor = false; - boolean restrictedFlavor = false; + String inheritanceBehaviour = ""; boolean translatableFlavor = false; type = definitionObject.type; defaultValue = definitionObject.defaultValue; + inheritanceBehaviour = definitionObject.inheritanceBehaviour; String classS = ""; String associationS = ""; @@ -1468,8 +1463,6 @@ String methodS = ""; String parameterS = ""; String referenceS = ""; - String disableOverrideF = ""; - String restrictedF = ""; String translatableF = ""; if (definitionObject.classScope){ @@ -1500,28 +1493,20 @@ referenceS = "X"; referenceScope = true; } - if (definitionObject.disableOverrideFlavor){ - disableOverrideF = "X"; - disableOverrideFlavor = true; - } - if (definitionObject.restrictedFlavor){ - restrictedF = "X"; - restrictedFlavor = true; - } if (definitionObject.translatableFlavor){ translatableF = "X"; translatableFlavor = true; } String as[] = {name, type, defaultValue, classS, associationS, indicationS, - propertyS, methodS, parameterS, referenceS, disableOverrideF, - restrictedF, translatableF}; + propertyS, methodS, parameterS, referenceS, inheritanceBehaviour, + translatableF}; tableitem.setText(as); tableitem.setData( new QualifierDefinitionObject(name, type, defaultValue, classScope, associationScope, indicationScope, propertyScope, methodScope, parameterScope, referenceScope, - disableOverrideFlavor, restrictedFlavor, translatableFlavor) + inheritanceBehaviour, translatableFlavor) ); @@ -1627,7 +1612,7 @@ List roles = association_.getOwnedEnds(); for (int k = 0; k < roles.size(); k++){ String roleName = ((Property)roles.get(k)).getName(); - // Sort + // Sort int i = 0; for(int j = rolesComboBox.getItemCount(); i < j; i++) { @@ -2194,8 +2179,7 @@ private boolean methodScope; private boolean parameterScope; private boolean referenceScope; - private boolean disableOverrideFlavor; - private boolean restrictedFlavor; + private String inheritanceBehaviour; private boolean translatableFlavor; public QualifierDefinitionObject(){ @@ -2210,16 +2194,14 @@ this.methodScope = false; this.parameterScope = false; this.referenceScope = false; - this.disableOverrideFlavor = false; - this.restrictedFlavor = false; + this.inheritanceBehaviour = null; this.translatableFlavor = false; } public QualifierDefinitionObject(String name, String type, String defaultValue, boolean classScope, boolean associationScope, boolean indicationScope, boolean propertyScope, boolean methodScope, boolean parameterScope, - boolean referenceScope, boolean disableOverrideFlavor, - boolean restrictedFlavor, boolean translatableFlavor){ + boolean referenceScope, String inheritanceBehaviour, boolean translatableFlavor){ this.name = name; this.type = type; @@ -2231,8 +2213,7 @@ this.methodScope = methodScope; this.parameterScope = parameterScope; this.referenceScope = referenceScope; - this.disableOverrideFlavor = disableOverrideFlavor; - this.restrictedFlavor = restrictedFlavor; + this.inheritanceBehaviour = inheritanceBehaviour; this.translatableFlavor = translatableFlavor; } @@ -2249,8 +2230,7 @@ this.methodScope == object.methodScope && this.parameterScope == object.parameterScope && this.referenceScope == object.referenceScope && - this.disableOverrideFlavor == object.disableOverrideFlavor && - this.restrictedFlavor == object.restrictedFlavor && + this.inheritanceBehaviour.equalsIgnoreCase(object.inheritanceBehaviour) && this.translatableFlavor == object.translatableFlavor) { return true; @@ -2319,18 +2299,16 @@ private String datatype; private String definedIn; private String flavor; - private String scope; private String defaultValue; private int index; public QualifierValueObject(String name, String value, String datatype, String definedIn, - String flavor, String scope, String defaultValue, int index){ + String flavor, String defaultValue, int index){ this.name = name; this.value = value; this.datatype = datatype; this.definedIn = definedIn; this.flavor = flavor; - this.scope = scope; this.defaultValue = defaultValue; this.index = index; } @@ -2646,14 +2624,13 @@ String as[] = { valueObject.name, valueObject.value, valueObject.datatype, - valueObject.definedIn, valueObject.flavor, valueObject.scope + valueObject.definedIn, valueObject.flavor }; tableitem.setText(as); tableitem.setData(new QualifierValueObject(valueObject.name, valueObject.value, - valueObject.datatype, valueObject.definedIn, valueObject.flavor, valueObject.scope, + valueObject.datatype, valueObject.definedIn, valueObject.flavor, valueObject.defaultValue, -1)); } - //if(lastAction.equalsIgnoreCase("default")){ if(!valueObject.value.equalsIgnoreCase(valueObject.defaultValue)){ Stereotype undoCimStereotype = element.getAppliedStereotype("CIM::Qualifiers"); @@ -2662,17 +2639,16 @@ element.setValue(undoCimStereotype, "QualifierName[" + undoStereotypePropertyIndex + "]", valueObject.name); element.setValue(undoCimStereotype, "QualifierValue[" + undoStereotypePropertyIndex + "]", valueObject.value); } - //} - + } else { // normal case: set default value TableItem tableitem = valueTable.getItem(index); String as[] = { valueObject.name, valueObject.defaultValue, valueObject.datatype, - valueObject.definedIn, valueObject.flavor, valueObject.scope + valueObject.definedIn, valueObject.flavor }; tableitem.setText(as); tableitem.setData(new QualifierValueObject(valueObject.name, valueObject.defaultValue, - valueObject.datatype, valueObject.definedIn, valueObject.flavor, valueObject.scope, + valueObject.datatype, valueObject.definedIn, valueObject.flavor, valueObject.defaultValue, -1)); } @@ -2877,11 +2853,10 @@ String datatype = object.datatype; String definedIn = object.definedIn; String flavor = object.flavor; - String scope = object.scope; - String defaultValue = object.defaultValue; - int index = object.index; + String defaultValue = object.defaultValue; + int index = object.index; - return new QualifierValueObject(name, value, datatype, definedIn, flavor, scope, defaultValue, index); + return new QualifierValueObject(name, value, datatype, definedIn, flavor, defaultValue, index); } private void addNewQualifiers(){ @@ -3233,10 +3208,9 @@ Button parameterButton; Button referenceButton; Group flavorGroup; + Button restrictedButton; Button enableOverrideButton; Button disableOverrideButton; - Button restrictedButton; - Button toSubclassButton; Button translatableButton; QualifierDefinitionDialog(Shell shell, String title, QualifierDefinitionObject definitionObject){ @@ -3309,9 +3283,9 @@ flavorGroup = new Group(mainComposite, SWT.NONE); flavorGroup.setText("Flavor"); flavorGroup.setLayout(new FormLayout()); - + enableOverrideButton = new Button(flavorGroup, SWT.RADIO); - enableOverrideButton.setText("EnableOverride"); + enableOverrideButton.setText("ToSubclass EnableOverride"); enableOverrideButton.setSelection(true); enableOverrideButton.addSelectionListener(new SelectionAdapter() { @@ -3319,57 +3293,25 @@ { enableOverrideButton.setSelection(true); disableOverrideButton.setSelection(false); - - if(definitionObject != null){ - if(definitionObject.restrictedFlavor){ - toSubclassButton.setSelection(false); - restrictedButton.setSelection(true); - } else { - toSubclassButton.setSelection(true); - restrictedButton.setSelection(false); - } - } else { - toSubclassButton.setSelection(true); - restrictedButton.setSelection(false); - } - - toSubclassButton.setEnabled(true); - restrictedButton.setEnabled(true); + restrictedButton.setSelection(false); } }); disableOverrideButton = new Button(flavorGroup, SWT.RADIO); - disableOverrideButton.setText("DisableOverride"); + disableOverrideButton.setText("ToSubclass DisableOverride"); disableOverrideButton.setSelection(false); disableOverrideButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent selectionevent) { - disableOverrideButton.setSelection(true); enableOverrideButton.setSelection(false); - - toSubclassButton.setSelection(true); + disableOverrideButton.setSelection(true); restrictedButton.setSelection(false); - toSubclassButton.setEnabled(false); - restrictedButton.setEnabled(false); } }); - toSubclassButton = new Button(flavorGroup, SWT.RADIO); - toSubclassButton.setText("ToSubclass"); - toSubclassButton.setSelection(true); - toSubclassButton.addSelectionListener(new SelectionAdapter() { - - public void widgetSelected(SelectionEvent selectionevent) - { - toSubclassButton.setSelection(true); - restrictedButton.setSelection(false); - } - - }); - restrictedButton = new Button(flavorGroup, SWT.RADIO); restrictedButton.setText("Restricted"); restrictedButton.setSelection(false); @@ -3377,8 +3319,9 @@ public void widgetSelected(SelectionEvent selectionevent) { + enableOverrideButton.setSelection(false); + disableOverrideButton.setSelection(false); restrictedButton.setSelection(true); - toSubclassButton.setSelection(false); } }); @@ -3469,22 +3412,24 @@ if(definitionObject.referenceScope) referenceButton.setSelection(true); - if(definitionObject.disableOverrideFlavor){ + if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("ToSubclass EnableOverride")){ + enableOverrideButton.setSelection(true); + disableOverrideButton.setSelection(false); + restrictedButton.setSelection(false); + } else if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("ToSubclass DisableOverride")){ + enableOverrideButton.setSelection(false); disableOverrideButton.setSelection(true); + restrictedButton.setSelection(false); + } else if(definitionObject.inheritanceBehaviour.equalsIgnoreCase("Restricted")){ enableOverrideButton.setSelection(false); - } - if(definitionObject.restrictedFlavor){ + disableOverrideButton.setSelection(false); restrictedButton.setSelection(true); - toSubclassButton.setSelection(false); } + + if(definitionObject.translatableFlavor){ translatableButton.setSelection(true); } - - if(definitionObject.disableOverrideFlavor){ - toSubclassButton.setEnabled(false); - restrictedButton.setEnabled(false); - } } private void fillDatatypeCombo(){ @@ -3539,9 +3484,14 @@ definitionObject.methodScope = methodButton.getSelection(); definitionObject.parameterScope = parameterButton.getSelection(); definitionObject.referenceScope = referenceButton.getSelection(); - - definitionObject.disableOverrideFlavor = disableOverrideButton.getSelection(); - definitionObject.restrictedFlavor = restrictedButton.getSelection(); + + if(enableOverrideButton.getSelection()){ + definitionObject.inheritanceBehaviour = "ToSubclass EnableOverride"; + } else if (disableOverrideButton.getSelection()){ + definitionObject.inheritanceBehaviour = "ToSubclass DisableOverride"; + } else if (restrictedButton.getSelection()){ + definitionObject.inheritanceBehaviour = "Restricted"; + } definitionObject.translatableFlavor = translatableButton.getSelection(); newDefinitionObject = definitionObject; @@ -3643,7 +3593,7 @@ formdata.right = new FormAttachment(100,-5); formdata.top = new FormAttachment(scopeGroup,10); flavorGroup.setLayoutData(formdata); - // first column + formdata = new FormData(); formdata.left = new FormAttachment(0,5); formdata.top = new FormAttachment(0,5); @@ -3653,22 +3603,17 @@ formdata.left = new FormAttachment(0,5); formdata.top = new FormAttachment(enableOverrideButton,10); disableOverrideButton.setLayoutData(formdata); - + formdata = new FormData(); formdata.left = new FormAttachment(0,5); formdata.top = new FormAttachment(disableOverrideButton,10); - formdata.bottom = new FormAttachment(100,-5); - translatableButton.setLayoutData(formdata); - // second column - formdata = new FormData(); - formdata.left = new FormAttachment(50,5); - formdata.top = new FormAttachment(0,5); - toSubclassButton.setLayoutData(formdata); + restrictedButton.setLayoutData(formdata); formdata = new FormData(); - formdata.left = new FormAttachment(50,5); - formdata.top = new FormAttachment(toSubclassButton,10); - restrictedButton.setLayoutData(formdata); + formdata.left = new FormAttachment(0,5); + formdata.top = new FormAttachment(restrictedButton,10); + formdata.bottom = new FormAttachment(100,-5); + translatableButton.setLayoutData(formdata); } } } |
|
From: Benjamin B. <bg...@us...> - 2005-05-23 07:16:41
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Qualifiers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31503/Plugin/com/ibm/ecute/Qualifiers Modified Files: Qualifier.java Log Message: Changes of the representation of qualifier flavors. Index: Qualifier.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Qualifiers/Qualifier.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Qualifier.java 10 May 2005 09:11:54 -0000 1.4 +++ Qualifier.java 23 May 2005 07:16:29 -0000 1.5 @@ -153,4 +153,25 @@ return flavorValue; } + + + public String rsaFlavor2String(){ + String flavor=""; + + if(RestrictedFlavor){ + flavor = "Restricted"; + } + if(!RestrictedFlavor){ + flavor = "ToSubclass"; + if(DissableOverrideFlavor){ + flavor += " DisableOverride"; + } else { + flavor += " EnableOverride"; + } + } + if (TranslatableFlavor) + flavor += ", Translatable"; + + return flavor; + } } |
|
From: Gareth S B. <bes...@us...> - 2005-05-22 21:05:50
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29498 Modified Files: interopProvider.c Log Message: fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1204560&group_id=128809&atid=712784 Index: interopProvider.c =================================================================== RCS file: /cvsroot/sblim/sfcb/interopProvider.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- interopProvider.c 22 May 2005 20:13:40 -0000 1.7 +++ interopProvider.c 22 May 2005 21:05:42 -0000 1.8 @@ -143,6 +143,8 @@ static void removeSubscription(Subscription *su, char *key) { + _SFCB_ENTER(TRACE_INDPROVIDER, "removeSubscription"); + if (subscriptionHt) { filterHt->ft->remove(filterHt,key); if (su) { @@ -153,6 +155,8 @@ if (su) { free (su); } + + _SFCB_EXIT(); } @@ -195,16 +199,21 @@ static void removeFilter(Filter *fi, char *key) { + _SFCB_ENTER(TRACE_INDPROVIDER, "removeFilter"); + if (filterHt) { filterHt->ft->remove(filterHt,key); } if (fi) { - free (fi); CMRelease(fi->fci); CMRelease(fi->qs); free(fi->query); free(fi->lang); + free(fi->sns); + free (fi); } + + _SFCB_EXIT(); } static Handler *addHandler(CMPIInstance *ci, CMPIObjectPath *op) @@ -246,12 +255,16 @@ static void removeHandler(Handler *ha, char *key) { + _SFCB_ENTER(TRACE_INDPROVIDER, "removeHandler"); + if (handlerHt) { handlerHt->ft->remove(handlerHt,key); } if (ha) { free (ha); } + + _SFCB_EXIT(); } extern int isChild(const char *ns, const char *parent, const char* child); |
