From kcardineaud@users.nuiton.org Wed Jun 29 16:57:03 2011
From: kcardineaud@users.nuiton.org
To: scmwebeditor-commits@list.nuiton.org
Subject: [Scmwebeditor-commits] r141 - trunk/src/main/webapp
Date: Wed, 29 Jun 2011 16:57:03 +0200
Message-ID: <20110629145703.2945915919@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0369820186383707854=="

--===============0369820186383707854==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: kcardineaud
Date: 2011-06-29 16:57:03 +0200 (Wed, 29 Jun 2011)
New Revision: 141

Url: http://nuiton.org/repositories/revision/scmwebeditor/141

Log:
Fix a bug with the selection of the type of file

Modified:
   trunk/src/main/webapp/ModificationViewer.jsp

Modified: trunk/src/main/webapp/ModificationViewer.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/webapp/ModificationViewer.jsp	2011-06-29 14:07:46 UTC (rev=
 140)
+++ trunk/src/main/webapp/ModificationViewer.jsp	2011-06-29 14:57:03 UTC (rev=
 141)
@@ -47,12 +47,9 @@
         <%
         String typeEditor=3D"null";
         if (request.getAttribute("format")!=3Dnull && request.getAttribute("=
format").equals("rst")){       =20
-            typeEditor=3D"rst";
-            %><h4>For any Problem with RestruturedText visit <a href=3D"http=
://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4>
-            <% } else if(request.getAttribute("format")!=3Dnull && request.g=
etAttribute("format").equals("html")) {
-            typeEditor=3D"text/html";
-        }
-           %>
+            %>
+            <h4>For any Problem with RestruturedText visit <a href=3D"http:/=
/docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4>
+            <% } %>
     </center>
    =20
=20
@@ -86,82 +83,85 @@
     </label>
=20
     <%
+    if(typeEditor.equals("null") && request.getAttribute("minetype")!=3Dnull=
) {
+
+        if(( (String) request.getAttribute("minetype")).contains("rst") ) {
+            typeEditor=3D"rst";
+        %>
+        <script type=3D'text/javascript'>
+        document.getElementById('language').selectedIndex=3D1
+        </script>
+        <%
+        }
+        else if(( (String) request.getAttribute("minetype")).contains("javas=
cript")) {
+            typeEditor=3D"javascript";
+        %>
+        <script type=3D'text/javascript'>
+        document.getElementById('language').selectedIndex=3D2
+        </script>  =20
+        <%
+        }
+        else if(( (String) request.getAttribute("minetype")).contains("html"=
) ) {
+            typeEditor=3D"text/html";
+        %>
+        <script type=3D'text/javascript'>
+        document.getElementById('language').selectedIndex=3D3
+        </script>
+        <%
+        }
+        else if(( (String) request.getAttribute("minetype")).contains("xml")=
 ) {
+            typeEditor=3D"xml";
+        %>
+        <script type=3D'text/javascript'>
+        document.getElementById('language').selectedIndex=3D4
+        </script>
+        <%
+        }
+    }
    =20
-    if(request.getAttribute("minetype")!=3Dnull && ( (String) request.getAtt=
ribute("minetype")).contains("rst") ) {
+    if (typeEditor.equals("null") && request.getAttribute("format")!=3Dnull){
+          =20
+           =20
+        if (request.getAttribute("format").equals("rst")) {       =20
         typeEditor=3D"rst";
-    %>
-    <script type=3D'text/javascript'>
-    document.getElementById('language').selectedIndex=3D1
-    </script>
-    <%
-    }
-    else if(request.getAttribute("minetype")!=3Dnull && ( (String) request.g=
etAttribute("minetype")).contains("javascript")) {
+        %>
+        <script type=3D'text/javascript'>
+        document.getElementById('language').selectedIndex=3D1
+        </script>
+        <% } else if(request.getAttribute("format").equals("javascript")) {
         typeEditor=3D"javascript";
-    %>
-    <script type=3D'text/javascript'>
-    document.getElementById('language').selectedIndex=3D2
-    </script>  =20
-    <%
-    }
-    else if(request.getAttribute("minetype")!=3Dnull && ( (String) request.g=
etAttribute("minetype")).contains("html") ) {
+        %>
+        <script type=3D'text/javascript'>
+        document.getElementById('language').selectedIndex=3D2
+        </script>                   =20
+        <% } else if(request.getAttribute("format").equals("html")) {
         typeEditor=3D"text/html";
-    %>
-    <script type=3D'text/javascript'>
-    document.getElementById('language').selectedIndex=3D3
-    </script>
-    <%
-    }
-    else if(request.getAttribute("minetype")!=3Dnull && ( (String) request.g=
etAttribute("minetype")).contains("xml") ) {
+        %>
+        <script type=3D'text/javascript'>
+        document.getElementById('language').selectedIndex=3D3
+        </script>
+        <%
+        } else if(request.getAttribute("format").equals("xml")) {
         typeEditor=3D"xml";
-    %>
-    <script type=3D'text/javascript'>
-    document.getElementById('language').selectedIndex=3D4
-    </script>
-    <%
-    }
-   =20
-    else {
-        if (request.getAttribute("format")!=3Dnull && request.getAttribute("=
format").equals("rst")){       =20
-            typeEditor=3D"rst";
-            %>
-            <script type=3D'text/javascript'>
-            document.getElementById('language').selectedIndex=3D1
-            </script>
-            <% } else if(request.getAttribute("format")!=3Dnull && request.g=
etAttribute("format").equals("javascript")) {
-            typeEditor=3D"javascript";
-            %>
-            <script type=3D'text/javascript'>
-            document.getElementById('language').selectedIndex=3D2
-            </script>                   =20
-            <% } else if(request.getAttribute("format")!=3Dnull && request.g=
etAttribute("format").equals("html")) {
-            typeEditor=3D"text/html";
-            %>
-            <script type=3D'text/javascript'>
-            document.getElementById('language').selectedIndex=3D3
-            </script>
-            <%
-            } else if(request.getAttribute("format")!=3Dnull && request.getA=
ttribute("format").equals("xml")) {
-            typeEditor=3D"xml";
-            %>
-            <script type=3D'text/javascript'>
-            document.getElementById('language').selectedIndex=3D4
-            </script>
-            <%
-            } else if(request.getAttribute("format")!=3Dnull && request.getA=
ttribute("format").equals("java")) {
-            typeEditor=3D"text/x-java";
-            %>
-            <script type=3D'text/javascript'>
-            document.getElementById('language').selectedIndex=3D5
-            </script>
-            <%
-            }
+        %>
+        <script type=3D'text/javascript'>
+        document.getElementById('language').selectedIndex=3D4
+        </script>
+        <%
+        } else if(request.getAttribute("format").equals("java")) {
+        typeEditor=3D"text/x-java";
+        %>
+        <script type=3D'text/javascript'>
+        document.getElementById('language').selectedIndex=3D5
+        </script>
+        <%
+        }
        =20
     }
+%>
=20
-        %>
=20
=20
-
     <script type=3D"text/javascript">
         var textarea =3D document.getElementById('newTextId');
         var uiOptions =3D { path : 'codemirror-ui/js/', searchMode : 'popup'=
 }=20


--===============0369820186383707854==--