From: Stian Soiland-R. <soi...@cs...> - 2012-01-19 09:48:09
|
On Wed, Dec 14, 2011 at 16:05, Ignazio Palmisano <ipa...@gm...> wrote: >> Hi, as I've been trying to fix bug 3440117 I tried to change >> TurtleParser.jj but realised the changes were not reflected. > That's because we are not rebuilding automatically the parsers. I'm > not 100% sure all parsers can be rebuilt on the fly, as some might > have had some customization after the generation. They are the same except for copyright headers and @Suppress java doc headers. Here I copied back the target/generated-sources/javacc/uk/ac/manchester/cs/owl/owlapi/turtle/parser/ to src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/ and moved the JJ file back there as well, before running a diff: diff --git a/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/ParseException.java b/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/ParseException.java index 27248eb..194e10c 100644 --- a/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/ParseException.java +++ b/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/ParseException.java @@ -1,42 +1,3 @@ -/* - * This file is part of the OWL API. - * - * The contents of this file are subject to the LGPL License, Version 3.0. - * - * Copyright (C) 2011, The University of Manchester - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * - * Alternatively, the contents of this file may be used under the terms of the Apache License, Version 2.0 - * in which case, the provisions of the Apache License Version 2.0 are applicable instead of those above. - * - * Copyright 2011, University of Manchester - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */ /* JavaCCOptions:KEEP_LINE_COL=null */ package uk.ac.manchester.cs.owl.owlapi.turtle.parser; @@ -50,7 +11,6 @@ package uk.ac.manchester.cs.owl.owlapi.turtle.parser; * You can modify this class to customize your error reporting * mechanisms so long as you retain the public fields. */ -@SuppressWarnings("javadoc") public class ParseException extends Exception { /** diff --git a/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/Token.java b/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/Token.java index e720cff..af3d05a 100644 --- a/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/Token.java +++ b/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/Token.java @@ -1,42 +1,3 @@ -/* - * This file is part of the OWL API. - * - * The contents of this file are subject to the LGPL License, Version 3.0. - * - * Copyright (C) 2011, The University of Manchester - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * - * Alternatively, the contents of this file may be used under the terms of the Apache License, Version 2.0 - * in which case, the provisions of the Apache License Version 2.0 are applicable instead of those above. - * - * Copyright 2011, University of Manchester - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - /* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */ /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ package uk.ac.manchester.cs.owl.owlapi.turtle.parser; @@ -44,7 +5,7 @@ package uk.ac.manchester.cs.owl.owlapi.turtle.parser; /** * Describes the input token stream. */ -@SuppressWarnings("javadoc") + public class Token implements java.io.Serializable { /** @@ -136,8 +97,7 @@ public class Token implements java.io.Serializable { /** * Returns the image. */ - @Override -public String toString() + public String toString() { return image; } diff --git a/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/TokenMgrError.java b/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/TokenMgrError.java index ca08394..bf57640 100644 --- a/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/TokenMgrError.java +++ b/turtle/src/main/java/uk/ac/manchester/cs/owl/owlapi/turtle/parser/TokenMgrError.java @@ -1,48 +1,8 @@ -/* - * This file is part of the OWL API. - * - * The contents of this file are subject to the LGPL License, Version 3.0. - * - * Copyright (C) 2011, The University of Manchester - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - * - * Alternatively, the contents of this file may be used under the terms of the Apache License, Version 2.0 - * in which case, the provisions of the Apache License Version 2.0 are applicable instead of those above. - * - * Copyright 2011, University of Manchester - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */ /* JavaCCOptions: */ package uk.ac.manchester.cs.owl.owlapi.turtle.parser; /** Token Manager Error. */ -@SuppressWarnings("javadoc") public class TokenMgrError extends Error { @@ -143,7 +103,7 @@ public class TokenMgrError extends Error * errorAfter : prefix that was seen before this error occurred * curchar : the offending character * Note: You can customize the lexical error message by modifying this method. - */@SuppressWarnings("unused") + */ protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) { return("Lexical error at line " + errorLine + ", column " + @@ -161,8 +121,7 @@ public class TokenMgrError extends Error * * from this method for such cases in the release version of your parser. */ - @Override -public String getMessage() { + public String getMessage() { return super.getMessage(); } -- Stian Soiland-Reyes, myGrid team School of Computer Science The University of Manchester |