Menu
▾
▴
[mvp-xml-cvs] XPointer/v2/src AssemblyInfo.cs,1.1,1.2 ElementSchemaPointerPart.cs,1.2,1.3 XPath1SchemaPointerPart.cs,1.2,1.3 XPointer.csproj,1.2,1.3 XPointerParser.cs,1.2,1.3 XPointerReader.cs,1.2,1.3 XmlnsSchemaPointerPart.cs,1.2,1.3
Update of /cvsroot/mvp-xml/XPointer/v2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18400/v2/src Modified Files: AssemblyInfo.cs ElementSchemaPointerPart.cs XPath1SchemaPointerPart.cs XPointer.csproj XPointerParser.cs XPointerReader.cs XmlnsSchemaPointerPart.cs Log Message: Index: XmlnsSchemaPointerPart.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v2/src/XmlnsSchemaPointerPart.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XmlnsSchemaPointerPart.cs 16 Oct 2005 16:02:15 -0000 1.2 +++ XmlnsSchemaPointerPart.cs 26 Oct 2005 15:46:35 -0000 1.3 @@ -3,6 +3,7 @@ using System; using System.Xml; using System.Xml.XPath; +using System.Diagnostics; #endregion @@ -36,6 +37,21 @@ #endregion + + #region properties + public string Prefix + { + get { return _prefix; } + set { _prefix = value; } + } + public string Uri + { + get { return _uri; } + set { _uri = value; } + } + #endregion + + #region PointerPart overrides /// <summary> Index: XPath1SchemaPointerPart.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v2/src/XPath1SchemaPointerPart.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XPath1SchemaPointerPart.cs 16 Oct 2005 16:02:15 -0000 1.2 +++ XPath1SchemaPointerPart.cs 26 Oct 2005 15:46:35 -0000 1.3 @@ -50,7 +50,7 @@ XPath1SchemaPointerPart part = new XPath1SchemaPointerPart(); try { - part.XPath = lexer.ParseEscapedData(); + part._xpath = lexer.ParseEscapedData(); } catch (Exception e) { Index: XPointer.csproj =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v2/src/XPointer.csproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XPointer.csproj 16 Oct 2005 16:02:15 -0000 1.2 +++ XPointer.csproj 26 Oct 2005 15:46:35 -0000 1.3 @@ -26,6 +26,7 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> + <SignAssembly>true</SignAssembly> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <OutputPath>bin\Debug\</OutputPath> @@ -84,39 +85,35 @@ </Reference> </ItemGroup> <ItemGroup> - <Compile Include="..\..\..\Common\v1\src\SR.cs"> + <Compile Include="..\..\..\Common\v2\src\SR.cs"> <Link>Common\SR.cs</Link> <SubType>Code</SubType> </Compile> - <Compile Include="..\..\..\Common\v1\src\XmlNamespaces.cs"> + <Compile Include="..\..\..\Common\v2\src\XmlNamespaces.cs"> <Link>Common\XmlNamespaces.cs</Link> <SubType>Code</SubType> </Compile> - <Compile Include="..\..\..\Common\v1\src\XmlNodeListFactory.cs"> + <Compile Include="..\..\..\Common\v2\src\XmlNodeListFactory.cs"> <Link>Common\XmlNodeListFactory.cs</Link> <SubType>Code</SubType> </Compile> - <Compile Include="..\..\..\Common\v1\src\XmlPrefix.cs"> + <Compile Include="..\..\..\Common\v2\src\XmlPrefix.cs"> <Link>Common\XmlPrefix.cs</Link> <SubType>Code</SubType> </Compile> - <Compile Include="..\..\..\Common\v1\src\XPath\DynamicContext.cs"> + <Compile Include="..\..\..\Common\v2\src\XPath\DynamicContext.cs"> <Link>Common\XPath\DynamicContext.cs</Link> <SubType>Code</SubType> </Compile> - <Compile Include="..\..\..\Common\v1\src\XPath\IHasXPathNavigator.cs"> + <Compile Include="..\..\..\Common\v2\src\XPath\IHasXPathNavigator.cs"> <Link>Common\XPath\IHasXPathNavigator.cs</Link> <SubType>Code</SubType> </Compile> - <Compile Include="..\..\..\Common\v1\src\XPath\XPathCache.cs"> + <Compile Include="..\..\..\Common\v2\src\XPath\XPathCache.cs"> <Link>Common\XPath\XPathCache.cs</Link> <SubType>Code</SubType> </Compile> - <Compile Include="..\..\..\Common\v1\src\XPath\XPathNavigatorReader.cs"> - <Link>Common\XPath\XPathNavigatorReader.cs</Link> - <SubType>Code</SubType> - </Compile> - <Compile Include="..\..\..\Common\v1\src\XPath\XPathVariable.cs"> + <Compile Include="..\..\..\Common\v2\src\XPath\XPathVariable.cs"> <Link>Common\XPath\XPathVariable.cs</Link> <SubType>Code</SubType> </Compile> @@ -172,7 +169,7 @@ <SubType>Code</SubType> </Compile> <Content Include="changelog.txt" /> - <EmbeddedResource Include="..\..\..\Common\v1\src\SR.resx"> + <EmbeddedResource Include="..\..\..\Common\v2\src\SR.resx"> <Link>Common\SR.resx</Link> <DependentUpon>SR.cs</DependentUpon> </EmbeddedResource> Index: XPointerParser.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v2/src/XPointerParser.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XPointerParser.cs 16 Oct 2005 16:02:15 -0000 1.2 +++ XPointerParser.cs 26 Oct 2005 15:46:35 -0000 1.3 @@ -44,8 +44,8 @@ } else schemaNSURI = String.Empty; - XPointerSchema.SchemaType schemaType = _schemas[schemaNSURI + ':' + lexer.NCName]; - return schemaType != null ? schemaType : XPointerSchema.SchemaType.Unknown; + string schemaQName = schemaNSURI + ':' + lexer.NCName; + return _schemas.ContainsKey(schemaQName)? _schemas[schemaQName] : XPointerSchema.SchemaType.Unknown; } Index: ElementSchemaPointerPart.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v2/src/ElementSchemaPointerPart.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ElementSchemaPointerPart.cs 16 Oct 2005 16:02:15 -0000 1.2 +++ ElementSchemaPointerPart.cs 26 Oct 2005 15:46:35 -0000 1.3 @@ -4,6 +4,7 @@ using System.Xml.XPath; using System.Xml; using System.Text; +using System.Diagnostics; using Mvp.Xml.Common.XPath; @@ -97,7 +98,7 @@ { throw new XPointerSyntaxException(SR.InvalidTokenInElementSchemeWhileClosingRoundBracketExpected); } - if (part.NCName == null && childSequenceLen == 0) + if (xpathBuilder.Length == 0 && childSequenceLen == 0) { Debug.WriteLine(SR.EmptyElementSchemeXPointer); return null; Index: XPointerReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v2/src/XPointerReader.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XPointerReader.cs 16 Oct 2005 16:02:15 -0000 1.2 +++ XPointerReader.cs 26 Oct 2005 15:46:35 -0000 1.3 @@ -42,7 +42,7 @@ _pointedNodes = pointer.Evaluate(nav); //There is always at least one identified node //XPathNodeIterator is already at the first node - _reader = new XPathNavigatorReader(_pointedNodes.Current); + _reader = _pointedNodes.Current.ReadSubtree(); } private XPathDocument CreateAndCacheDocument(XmlReader r, bool supportSchemaDeterminedIDs) @@ -300,19 +300,19 @@ get { return _reader.EOF; } } - /// <summary>See <see cref="XmlReader.GetAttribute"/>.</summary> + /// <summary>See <see cref="XmlReader.GetAttribute(int)"/>.</summary> public override string GetAttribute(int i) { return _reader.GetAttribute(i); } - /// <summary>See <see cref="XmlReader.GetAttribute"/>.</summary> + /// <summary>See <see cref="XmlReader.GetAttribute(string)"/>.</summary> public override string GetAttribute(string name) { return _reader.GetAttribute(name); } - /// <summary>See <see cref="XmlReader.GetAttribute"/>.</summary> + /// <summary>See <see cref="XmlReader.GetAttribute(string, string)"/>.</summary> public override string GetAttribute(string name, string namespaceURI) { return _reader.GetAttribute(name, namespaceURI); @@ -330,19 +330,19 @@ return _reader.LookupNamespace(prefix); } - /// <summary>See <see cref="XmlReader.MoveToAttribute"/>.</summary> + /// <summary>See <see cref="XmlReader.MoveToAttribute(int)"/>.</summary> public override void MoveToAttribute(int i) { _reader.MoveToAttribute(i); } - /// <summary>See <see cref="XmlReader.MoveToAttribute"/>.</summary> + /// <summary>See <see cref="XmlReader.MoveToAttribute(string)"/>.</summary> public override bool MoveToAttribute(string name) { return _reader.MoveToAttribute(name); } - /// <summary>See <see cref="XmlReader.MoveToAttribute"/>.</summary> + /// <summary>See <see cref="XmlReader.MoveToAttribute(string, string)"/>.</summary> public override bool MoveToAttribute(string name, string ns) { return _reader.MoveToAttribute(name, ns); @@ -378,19 +378,19 @@ get { return _reader.ReadState; } } - /// <summary>See <see cref="XmlReader.this"/>.</summary> + /// <summary>See <see cref="XmlReader.this[int]"/>.</summary> public override String this[int i] { get { return _reader[i]; } } - /// <summary>See <see cref="XmlReader.this"/>.</summary> + /// <summary>See <see cref="XmlReader.this[string]"/>.</summary> public override string this[string name] { get { return _reader[name]; } } - /// <summary>See <see cref="XmlReader.this"/>.</summary> + /// <summary>See <see cref="XmlReader.this[string, string]"/>.</summary> public override string this[string name, string namespaceURI] { get { return _reader[name, namespaceURI]; } Index: AssemblyInfo.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v2/src/AssemblyInfo.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AssemblyInfo.cs 16 Oct 2005 15:17:03 -0000 1.1 +++ AssemblyInfo.cs 26 Oct 2005 15:46:35 -0000 1.2 @@ -11,9 +11,6 @@ [assembly: AssemblyDescription("MVP XML Library - XPointer.NET Module")] [assembly: AssemblyVersion("2.0.*")] -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("../../../../../Global/v1/mvp-xml.snk")] -[assembly: AssemblyKeyName("")] #region Security Permissions |
