[mvp-xml-cvs] XPointer/v1/src SR.cs,1.1,1.2 SR.resx,1.3,1.4 SchemaBasedPointer.cs,1.3,1.4 ShorthandPointer.cs,1.3,1.4 XPointer.csproj,1.4,1.5 XPointerParser.cs,1.3,1.4 XPointerReader.cs,1.4,1.5

[Oleg T. <he...@us...>]

Update of /cvsroot/mvp-xml/XPointer/v1/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv798/v1/src

Modified Files:
	SR.cs SR.resx SchemaBasedPointer.cs ShorthandPointer.cs 
	XPointer.csproj XPointerParser.cs XPointerReader.cs 
Log Message:
Working on bugs.

Index: XPointerParser.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XPointerParser.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- XPointerParser.cs	26 Oct 2004 19:26:51 -0000	1.3
+++ XPointerParser.cs	28 Oct 2004 12:55:01 -0000	1.4
@@ -120,7 +120,7 @@
                     else        
                         throw new XPointerSyntaxException(SR.InvalidToken);
                 }
-                return new SchemaBasedPointer(parts);	        
+                return new SchemaBasedPointer(parts, xpointer);	        
             }
         }
 

Index: SchemaBasedPointer.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XPointer/v1/src/SchemaBasedPointer.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SchemaBasedPointer.cs	9 Oct 2004 19:52:19 -0000	1.3
+++ SchemaBasedPointer.cs	28 Oct 2004 12:55:01 -0000	1.4
@@ -17,7 +17,8 @@
 
         #region private members
 
-        private ArrayList _parts;	    
+        private ArrayList _parts;
+	    private string _xpointer;
 
         #endregion
 
@@ -27,9 +28,12 @@
         /// Creates scheme based XPointer given list of pointer parts.
         /// </summary>
         /// <param name="parts">List of pointer parts</param>
-        public SchemaBasedPointer(ArrayList parts) 
+        /// <param name="xpointer">String representation of the XPointer 
+        /// (for error diagnostics)</param>
+        public SchemaBasedPointer(ArrayList parts, string xpointer) 
         {
-            _parts = parts;			
+            _parts = parts;		
+	        _xpointer = xpointer;
         }
 
         #endregion
@@ -67,7 +71,7 @@
                 if (result != null && result.MoveNext())
                     return result;
             }
-            throw new NoSubresourcesIdentifiedException(SR.NoSubresourcesIdentifiedException);
+            throw new NoSubresourcesIdentifiedException(SR.GetString("NoSubresourcesIdentifiedException", _xpointer));
         }
 
         #endregion

Index: ShorthandPointer.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XPointer/v1/src/ShorthandPointer.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ShorthandPointer.cs	9 Oct 2004 19:52:19 -0000	1.3
+++ ShorthandPointer.cs	28 Oct 2004 12:55:01 -0000	1.4
@@ -62,7 +62,7 @@
                 return result;
             }
             else
-                throw new NoSubresourcesIdentifiedException(SR.NoSubresourcesIdentifiedException);            
+                throw new NoSubresourcesIdentifiedException(SR.GetString("NoSubresourcesIdentifiedException", _NCName));            
         }				
         #endregion
     }

Index: XPointerReader.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XPointerReader.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- XPointerReader.cs	19 Oct 2004 16:27:39 -0000	1.4
+++ XPointerReader.cs	28 Oct 2004 12:55:01 -0000	1.5
@@ -97,7 +97,7 @@
         /// Additionally sets a flag whether to support schema-determined IDs.
         /// </summary>	    
         public XPointerReader(XmlReader reader, string xpointer, bool supportSchemaDeterminedIDs) 
-        {
+        {            
             XmlValidatingReader vr = null;
             if (supportSchemaDeterminedIDs) 
             {
@@ -110,8 +110,8 @@
                 vr.ValidationType = ValidationType.None;
             }
             vr.EntityHandling = EntityHandling.ExpandEntities;
-            vr.ValidationEventHandler += new System.Xml.Schema.ValidationEventHandler(ValidationCallback);            
-            XPathDocument doc = new XPathDocument(vr, XmlSpace.Preserve);
+            vr.ValidationEventHandler += new System.Xml.Schema.ValidationEventHandler(ValidationCallback);
+            XPathDocument doc = new XPathDocument(vr, XmlSpace.Preserve);            
             vr.Close();
             Init(doc, xpointer);
         }        

Index: SR.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XPointer/v1/src/SR.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SR.cs	4 Oct 2004 19:05:55 -0000	1.1
+++ SR.cs	28 Oct 2004 12:55:01 -0000	1.2
@@ -82,16 +82,7 @@
             {
                 return SR.GetString("EmptyElementSchemeXPointer");
             }
-        }                
-
-        /// <summary></summary>
-        public static string NoSubresourcesIdentifiedException
-        {
-            get
-            {
-                return SR.GetString("NoSubresourcesIdentifiedException");
-            }
-        }                
+        }                                      
 
         /// <summary></summary>
         public static string InvalidTokenInXmlnsSchemeWhileNCNameExpected

Index: SR.resx
===================================================================
RCS file: /cvsroot/mvp-xml/XPointer/v1/src/SR.resx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SR.resx	19 Oct 2004 16:27:38 -0000	1.3
+++ SR.resx	28 Oct 2004 12:55:01 -0000	1.4
@@ -52,7 +52,7 @@
 		<value>Syntax error in element() scheme data: empty XPointer.</value>
 	</data>
 	<data name="NoSubresourcesIdentifiedException" type="System.String" mimetype="System.String">
-		<value>XPointer doesn't identify any subresources.</value>
+		<value>XPointer '{0}' doesn't identify any subresources.</value>
 	</data>
 	<data name="InvalidTokenInXmlnsSchemeWhileNCNameExpected" type="System.String" mimetype="System.String">
 		<value>Syntax error in xmlns() scheme data: Invalid token in XmlnsSchemaData, NCName was expected.</value>

Index: XPointer.csproj
===================================================================
RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XPointer.csproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- XPointer.csproj	11 Oct 2004 20:56:47 -0000	1.4
+++ XPointer.csproj	28 Oct 2004 12:55:01 -0000	1.5
@@ -76,8 +76,8 @@
                 />
                 <Reference
                     Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+                    AssemblyName = "System.XML"
+                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
                 />
             </References>
         </Build>
@@ -242,12 +242,6 @@
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Common\XmlTransformingReader.cs"
-                    Link = "..\..\..\Common\v1\src\XmlTransformingReader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
                     RelPath = "Common\XPath\DynamicContext.cs"
                     Link = "..\..\..\Common\v1\src\XPath\DynamicContext.cs"
                     SubType = "Code"