INTEGRATION: CWS scriptingf4 (1.2.4); FILE MERGED
2004/05/12 10:24:18 npower 1.2.4.2: #i28818# in testing for implementation of this issue, untitiled documents not handled very well. Reason code uses URL from XModel which however is blank for untitled documents. Now using the oid ( stringified ) Issue number: Submitted by: Reviewed by: 2004/04/29 14:09:23 dfoster 1.2.4.1: #i28384# - implement Macro Selector specification Issue number: Submitted by: Reviewed by:
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
*
|
||||
* $RCSfile: ScriptMetaData.java,v $
|
||||
*
|
||||
* $Revision: 1.3 $
|
||||
* $Revision: 1.4 $
|
||||
*
|
||||
* last change: $Author: hr $ $Date: 2004-05-10 17:41:45 $
|
||||
* last change: $Author: rt $ $Date: 2004-05-19 08:22:23 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
@@ -104,9 +104,7 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable {
|
||||
public ScriptMetaData( Parcel parent, ScriptEntry entry,
|
||||
String source )
|
||||
{
|
||||
super( entry.getLanguage(), entry.getLanguageName(),
|
||||
entry.getLogicalName(), entry.getLocation(),
|
||||
entry.getLanguageProperties() );
|
||||
super( entry );
|
||||
this.parent = parent;
|
||||
if ( source != null )
|
||||
{
|
||||
@@ -456,8 +454,8 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable {
|
||||
String parcelLocation = parent.getPathToParcel();
|
||||
String sourceFileName = getLanguageName();
|
||||
boolean result = false;
|
||||
|
||||
if ( parcelLocation.startsWith( "file://" ) ) // its a document
|
||||
boolean isDocument = getLocationPlaceHolder().equals( "document" );
|
||||
if ( isDocument ) // its a document
|
||||
{
|
||||
XStorageHelper xParcelDirStorageHelper = null;
|
||||
boolean commitFlag = true;
|
||||
|
Reference in New Issue
Block a user