cvs commit: jahia/core/src/java/org/jahia/engines/shared JahiaPageEngineTempBean.java Page_Field.java

[Serge Huber]

shuber      2004/09/23 18:04:24 CEST

  Modified files:
    core/src/java/org/jahia/engines/shared 
                                           JahiaPageEngineTempBean.java 
                                           Page_Field.java 
  Log:
  Default page title for remote URLs is now the URL itself, or Undefined URL if no URL 
is entered.
  
  Revision  Changes    Path
  1.3       +1 -1      
jahia/core/src/java/org/jahia/engines/shared/JahiaPageEngineTempBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/JahiaPageEngineTempBean.java.diff?r1=1.2&r2=1.3&f=h
  1.6       +12 -0     jahia/core/src/java/org/jahia/engines/shared/Page_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/Page_Field.java.diff?r1=1.5&r2=1.6&f=h
  
  
  
  Index: JahiaPageEngineTempBean.java
  ===================================================================
  RCS file: 
/cvs/jahia/core/src/java/org/jahia/engines/shared/JahiaPageEngineTempBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JahiaPageEngineTempBean.java      5 Aug 2004 15:49:47 -0000       1.2
  +++ JahiaPageEngineTempBean.java      23 Sep 2004 16:04:23 -0000      1.3
  @@ -34,7 +34,7 @@
       private  int pageLinkID;
       private  String creator;
       private int linkFieldID;
  -    private String operation = Page_Field.CREATE_PAGE;
  +    private String operation = Page_Field.RESET_LINK;
       private boolean sharedTitle;
   
       public JahiaPageEngineTempBean( int id,
  
  
  
  Index: Page_Field.java
  ===================================================================
  RCS file: /cvs/jahia/core/src/java/org/jahia/engines/shared/Page_Field.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Page_Field.java   2 Aug 2004 14:54:56 -0000       1.5
  +++ Page_Field.java   23 Sep 2004 16:04:23 -0000      1.6
  @@ -380,6 +380,18 @@
               String remoteURL = jParams.getRequest().getParameter("remote_url");
               pageBean.setRemoteURL(remoteURL);
               pageBean.setPageType(JahiaPage.TYPE_URL);
  +            if ((title == null) || ("".equals(title))) {
  +                if (remoteURL.startsWith("http://";)) {
  +                    title = remoteURL.substring("http://".length());
  +                } else if (remoteURL.startsWith("https://";)) {
  +                    title = remoteURL.substring("https://".length());
  +                } else {
  +                    title = remoteURL;
  +                }
  +                if ("".equals(title)) {
  +                    title = "Undefined URL";
  +                }
  +            }
           } else if (LINK_JAHIA_PAGE.equals(operation) ||
                      MOVE_PAGE.equals(operation)) {
               int selectedPageID = pageBean.getPageLinkID();