Skip to content

Commit 3e94fb5

Browse files
author
Emmanuel Hugonnet
committed
Fixing bug by adding WINDOWS 8 a a new Windows version in FinderFactory which provides the correct finder implementation based on the OS.
1 parent d9bcd13 commit 3e94fb5

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

src/main/java/org/silverpeas/openoffice/OfficeLauncher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import java.util.logging.Level;
2525
import java.util.logging.Logger;
2626

27-
import org.apache.commons.httpclient.HttpException;
28-
2927
import org.silverpeas.openoffice.util.FinderFactory;
3028
import org.silverpeas.openoffice.util.MessageDisplayer;
3129
import org.silverpeas.openoffice.util.MessageUtil;
@@ -34,6 +32,8 @@
3432
import org.silverpeas.openoffice.windows.FileWebDavAccessManager;
3533
import org.silverpeas.openoffice.windows.MsOfficeVersion;
3634

35+
import org.apache.commons.httpclient.HttpException;
36+
3737
/**
3838
* @author Emmanuel Hugonnet
3939
*/

src/main/java/org/silverpeas/openoffice/util/FinderFactory.java

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
/**
22
* Copyright (C) 2000 - 2009 Silverpeas
33
*
4-
* This program is free software: you can redistribute it and/or modify
5-
* it under the terms of the GNU Affero General Public License as
6-
* published by the Free Software Foundation, either version 3 of the
7-
* License, or (at your option) any later version.
4+
* This program is free software: you can redistribute it and/or modify it under the terms of the
5+
* GNU Affero General Public License as published by the Free Software Foundation, either version 3
6+
* of the License, or (at your option) any later version.
87
*
9-
* As a special exception to the terms and conditions of version 3.0 of
10-
* the GPL, you may redistribute this Program in connection with Free/Libre
11-
* Open Source Software ("FLOSS") applications as described in Silverpeas's
12-
* FLOSS exception. You should have received a copy of the text describing
13-
* the FLOSS exception, and it is also available here:
8+
* As a special exception to the terms and conditions of version 3.0 of the GPL, you may
9+
* redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS")
10+
* applications as described in Silverpeas's FLOSS exception. You should have received a copy of the
11+
* text describing the FLOSS exception, and it is also available here:
1412
* "http://repository.silverpeas.com/legal/licensing"
1513
*
16-
* This program is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU Affero General Public License for more details.
14+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
15+
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
* Affero General Public License for more details.
2017
*
21-
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
* You should have received a copy of the GNU Affero General Public License along with this program.
19+
* If not, see <http://www.gnu.org/licenses/>.
2320
*/
2421

2522
/*
@@ -45,9 +42,10 @@ public static OfficeFinder getFinder(final MsOfficeType contentType) {
4542
case WINDOWS_XP:
4643
case WINDOWS_VISTA:
4744
case WINDOWS_SEVEN:
45+
case WINDOWS_8:
4846
if (contentType.isMsOfficeCompatible()) {
49-
return new MsOfficeRegistryHelper();
50-
}
47+
return new MsOfficeRegistryHelper();
48+
}
5149
return new WindowsOpenOfficeFinder();
5250
case LINUX:
5351
return new WhereisHelper();

0 commit comments

Comments
 (0)